diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2012-03-13 17:02:12 -0500 |
|---|---|---|
| committer | Oliver Brown <oliver.brown@freescale.com> | 2012-03-19 15:58:16 -0500 |
| commit | e6ea6be624ce8382a00c5a851b871cc433c4fc3f (patch) | |
| tree | 73fbac03f1c8fbb99a134cee2715af3ac3e4febc | |
| parent | 06a31966975a32ff55cc9d04fbc8eea785d19c90 (diff) | |
| download | u-boot-imx-e6ea6be624ce8382a00c5a851b871cc433c4fc3f.zip u-boot-imx-e6ea6be624ce8382a00c5a851b871cc433c4fc3f.tar.gz u-boot-imx-e6ea6be624ce8382a00c5a851b871cc433c4fc3f.tar.bz2 | |
ENGR00177213 - U-Boot Changes for ICS iMX53 SMDimx-android-r14-alphamaddev-imx-android-r10.3
Increased maximum command buffer to 512 to handle long nfs string.
Added default arguments for booting from NFS.
Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
| -rw-r--r-- | common/main.c | 5 | ||||
| -rwxr-xr-x | include/configs/mx53_smd_android_ics.h | 46 |
2 files changed, 31 insertions, 20 deletions
diff --git a/common/main.c b/common/main.c index 026edd1..78a370d 100644 --- a/common/main.c +++ b/common/main.c @@ -526,7 +526,12 @@ void reset_cmd_timeout(void) #define CTL_CH(c) ((c) - 'a' + 1) +#if defined(CONFIG_MX53_SMD) && defined(CONFIG_SYS_CBSIZE) +#define MAX_CMDBUF_SIZE CONFIG_SYS_CBSIZE +#else #define MAX_CMDBUF_SIZE 256 +#endif + #define CTL_BACKSPACE ('\b') #define DEL ((char)255) diff --git a/include/configs/mx53_smd_android_ics.h b/include/configs/mx53_smd_android_ics.h index fd9ab5b..3d87dc3 100755 --- a/include/configs/mx53_smd_android_ics.h +++ b/include/configs/mx53_smd_android_ics.h @@ -163,25 +163,31 @@ #define CONFIG_LOADADDR 0x70800000 /* loadaddr env var */ #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x500000) -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ethprime=FEC0\0" \ - "ethaddr=00:04:9f:00:ea:d3\0" \ - "bootfile=uImage\0" \ - "loadaddr=0x70800000\0" \ - "rd_loadaddr=0x70D00000\0" \ - "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\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_eMMC; bootm ${loadaddr} ${rd_loadaddr}\0" \ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "autoload=n\0" \ + "bootfile=uImage\0" \ + "loadaddr=0x70800000\0" \ + "rd_loadaddr=0x70D00000\0" \ + "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\0" \ + "bootcmd_eMMC=setenv bootargs ${bootargs_base} fs_sdcard=0;" \ + "mmc read 1 ${loadaddr} 0x800 0x2000;" \ + "mmc read 1 ${rd_loadaddr} 0x3000 0x300;" \ + "bootm ${loadaddr} ${rd_loadaddr}\0" \ + "bootcmd_NFS=dhcp;nfs ${loadaddr} ${serverip}:${nfskernel}; " \ + "setenv bootargs ${bootargs_base} root=/dev/nfs " \ + "nfsroot=${serverip}:${nfsroot} rw ip=dhcp;" \ + "bootm\0" \ + "bootcmd_SD=setenv bootargs ${bootargs_base} fs_sdcard=1;" \ + "mmc read 0 ${loadaddr} 0x800 0x2000;" \ + "mmc read 0 ${rd_loadaddr} 0x3000 0x300;" \ + "bootm ${loadaddr} ${rd_loadaddr}\0" \ + "bootcmd=run bootcmd_eMMC\0" \ #define CONFIG_ARP_TIMEOUT 200UL @@ -191,7 +197,7 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PROMPT "MX53-SMD U-Boot > " #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 256 /* max number of command args */ |