ARMV7: Update default environment for OMAP4 boards
Specify vram on command line, remove erroneous call to nandboot in the boot script, add CONFIG_BOOTDELAY Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Nishanth Menon <menon.nishanth@gmail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
parent
cbd7b09cb3
commit
1b03eede4f
@ -153,6 +153,8 @@
|
||||
* Environment setup
|
||||
*/
|
||||
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
|
||||
/* allow overwriting serial config and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
@ -160,10 +162,12 @@
|
||||
"loadaddr=0x82000000\0" \
|
||||
"console=ttyS2,115200n8\0" \
|
||||
"usbtty=cdc_acm\0" \
|
||||
"vram=16M\0" \
|
||||
"mmcdev=1\0" \
|
||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||
"mmcrootfstype=ext3 rootwait\0" \
|
||||
"mmcargs=setenv bootargs console=${console} " \
|
||||
"vram=${vram} " \
|
||||
"root=${mmcroot} " \
|
||||
"rootfstype=${mmcrootfstype}\0" \
|
||||
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
||||
@ -181,7 +185,6 @@
|
||||
"else " \
|
||||
"if run loaduimage; then " \
|
||||
"run mmcboot; " \
|
||||
"else run nandboot; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"fi"
|
||||
|
@ -154,6 +154,8 @@
|
||||
* Environment setup
|
||||
*/
|
||||
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
|
||||
/* allow overwriting serial config and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
@ -161,10 +163,12 @@
|
||||
"loadaddr=0x82000000\0" \
|
||||
"console=ttyS2,115200n8\0" \
|
||||
"usbtty=cdc_acm\0" \
|
||||
"vram=16M\0" \
|
||||
"mmcdev=1\0" \
|
||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||
"mmcrootfstype=ext3 rootwait\0" \
|
||||
"mmcargs=setenv bootargs console=${console} " \
|
||||
"vram=${vram} " \
|
||||
"root=${mmcroot} " \
|
||||
"rootfstype=${mmcrootfstype}\0" \
|
||||
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
||||
@ -182,7 +186,6 @@
|
||||
"else " \
|
||||
"if run loaduimage; then " \
|
||||
"run mmcboot; " \
|
||||
"else run nandboot; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"fi"
|
||||
|
Loading…
Reference in New Issue
Block a user