diff options
| author | Rob Herring <rob.herring@linaro.org> | 2015-02-07 11:43:45 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@linaro.org> | 2015-02-11 20:09:12 -0600 |
| commit | e82243b86b603506a12a6962fce839f352d7090f (patch) | |
| tree | 2b89d7f72e33f9619fbaa9d1ac5a04cc22925419 | |
| parent | 2e64a9fe51d1d01dae8cf1d0c2f21337664139f8 (diff) | |
pxa1928_ara: convert boot command to use bootm
Use standard bootm command instead of Marvell's custom command.
Change-Id: I331ea215219b3890ecd84fd4ce2282f0eb23c628
Signed-off-by: Rob Herring <rob.herring@linaro.org>
| -rw-r--r-- | include/configs/pxa1928_ara.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/include/configs/pxa1928_ara.h b/include/configs/pxa1928_ara.h index 8ab6176caa..3e82f313ac 100644 --- a/include/configs/pxa1928_ara.h +++ b/include/configs/pxa1928_ara.h @@ -97,30 +97,22 @@ */ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_SHOW_BOOT_PROGRESS -#define CONFIG_MRVL_BOOT #define CONFIG_MISC_INIT_R -#define CONFIG_BOOTARGS \ - "initrd=0x03000000,10m rw androidboot.console=ttyS0" \ - " console=ttyS0,115200 panic_debug uart_dma" \ - " crashkernel=4k@0x8140000 androidboot.lcd=1080_50 user_debug=31" \ - " earlyprintk=uart8250-32bit,0xd4018000" +#define CONFIG_BOOTARGS \ + "rw console=ttyS0,115200 panic_debug uart_dma" + +#define CONFIG_BOOTCOMMAND \ + "while true; do " \ + "mmc read ${fdt_addr_r} 0x10000 0x1000; " \ + "fastboot; " \ + "mmc read ${fdt_addr_r} 0x10000 0x1000; " \ + "mmc read ${kernel_addr_r} 0x8000 0x8000 && " \ + "bootm ${kernel_addr_r} ${kernel_addr_r} ${fdt_addr_r};" \ + "done" -#define CONFIG_BOOTCOMMAND "fastboot; mrvlboot" #define CONFIG_MMC_BOOT_DEV "mmc dev 0 0" -#define RAMDISK_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x03000000) -#define BOOTIMG_EMMC_ADDR 0x01000000 -#define RECOVERYIMG_EMMC_ADDR 0x00500000 -/* Kernel size is set to 4MB for legacy non-boot.img format */ -#define KERNEL_SIZE 0x00400000 -#define RAMDISK_SIZE 0x00400000 -#define RECOVERY_KERNEL_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x01080000) -#define RECOVERY_RAMDISK_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x02A00000) #define CONFIG_OF_LIBFDT -#define DTB_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x02000000) -#define DTB_EMMC_ADDR (BOOTIMG_EMMC_ADDR + 0xF00000) -#define RECOVERY_DTB_EMMC_ADDR (RECOVERYIMG_EMMC_ADDR + 0x900000) -#define DTB_SIZE 0x00040000 /* * Environment variables configurations @@ -137,6 +129,8 @@ "autostart=yes\0" \ "verify=yes\0" \ "cdc_connect_timeout=60\0" \ + "fdt_addr_r=0x03000000\0" \ + "kernel_addr_r=0x0127f800\0" \ "partitions=" \ "name=DTIM,start=0x00200000,size=0x200000;" \ "name=recovery,start=0x00400000,size=0xb00000;" \ |