summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2010-07-07 15:25:25 -0700
committerSandeep Paulraj <s-paulraj@ti.com>2010-08-05 10:11:50 -0400
commit1b03eede4fed47c6af7df84b0f7b621ff3e3bb40 (patch)
treea1ee9b35b1c85bd59eca4ae01e4e6cc03dafc493
parentcbd7b09cb3a3841710b31b5d1b208a4cceae433c (diff)
downloadu-boot-imx-1b03eede4fed47c6af7df84b0f7b621ff3e3bb40.zip
u-boot-imx-1b03eede4fed47c6af7df84b0f7b621ff3e3bb40.tar.gz
u-boot-imx-1b03eede4fed47c6af7df84b0f7b621ff3e3bb40.tar.bz2
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>
-rw-r--r--include/configs/omap4_panda.h5
-rw-r--r--include/configs/omap4_sdp4430.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 1d76467..a0d27a4 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -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"
diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index e9909f9..d5439f9 100644
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -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"