From 06a31966975a32ff55cc9d04fbc8eea785d19c90 Mon Sep 17 00:00:00 2001 From: Oliver Brown Date: Mon, 12 Mar 2012 17:39:20 -0500 Subject: ENGR00175594: iMX53 SMD ICS default boot environment Changing the default iMX53 SMD ICS boot configuration file to boot from internal eMMC. Signed-off-by: Oliver Brown --- include/configs/mx53_smd_android_ics.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/include/configs/mx53_smd_android_ics.h b/include/configs/mx53_smd_android_ics.h index 5215823..fd9ab5b 100755 --- a/include/configs/mx53_smd_android_ics.h +++ b/include/configs/mx53_smd_android_ics.h @@ -100,9 +100,13 @@ #define CONFIG_MTD_PARTITIONS -#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC \ - "setenv bootargs ${bootargs} init=/init root=/dev/mmcblk0p4 " \ - "rootfs=ext4 video=mxcdi1fb:RGB666,XGA ldb=di1 di1_primary" +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC \ + "setenv bootargs console=ttymxc0,115200 init=/init " \ + "androidboot.console=ttymxc0 " \ + "video=mxcdi1fb:RGB666,LDB-XGA " \ + "ldb=di1 di1_primary pmem=128M,64M fbmem=10M " \ + "gpu_memory=128M vmalloc=576M fs_sdcard=0 " \ + "root=/dev/mmcblk0p4 rootfs=ext4" #define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC \ "run bootargs_android_recovery;" \ "mmc read 1 ${loadaddr} 0x800 0x2000;bootm" @@ -166,14 +170,18 @@ "bootfile=uImage\0" \ "loadaddr=0x70800000\0" \ "rd_loadaddr=0x70D00000\0" \ - "bootargs=console=ttymxc0,115200 init=/init " \ + "bootargs_base=console=ttymxc0,115200 init=/init " \ "androidboot.console=ttymxc0 " \ "video=mxcdi1fb:RGB666,LDB-XGA " \ "ldb=di1 di1_primary pmem=128M,64M fbmem=10M " \ - "gpu_memory=128M vmalloc=576M fs_sdcard=1\0" \ - "bootcmd_SD=mmc read 0 ${loadaddr} 0x800 0x2000;" \ + "gpu_memory=128M vmalloc=576M\0" \ + "bootcmd_eMMC=setenv bootargs ${bootargs_base} fs_sdcard=0;" \ + "mmc read 1 ${loadaddr} 0x800 0x2000;" \ + "mmc read 1 ${rd_loadaddr} 0x3000 0x300\0" \ + "bootcmd_SD=setenv bootargs ${bootargs_base} fs_sdcard=1;" \ + "mmc read 0 ${loadaddr} 0x800 0x2000;" \ "mmc read 0 ${rd_loadaddr} 0x3000 0x300\0" \ - "bootcmd=run bootcmd_SD; bootm ${loadaddr} ${rd_loadaddr}\0" \ + "bootcmd=run bootcmd_eMMC; bootm ${loadaddr} ${rd_loadaddr}\0" \ #define CONFIG_ARP_TIMEOUT 200UL -- cgit v1.1