On 07/21/2010 02:25 PM, Steve Sakoman wrote:
Specify vram on command line, remove erroneous call to nandboot in the boot script, add CONFIG_BOOTDELAY
Signed-off-by: Steve Sakomansteve@sakoman.com
include/configs/omap4_panda.h | 5 ++++- include/configs/omap4_sdp4430.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 1d76467..51c3b44 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -153,6 +153,8 @@
- Environment setup
*/
+#define CONFIG_BOOTDELAY 5
why? default 3 is good rt? ;)
/* 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} " \@@ -181,7 +185,6 @@ "else " \ "if run loaduimage; then " \ "run mmcboot; " \
"else run nandboot; " \
ack
"fi; " \ "fi; " \"fi" diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index e9909f9..2643e43 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -154,6 +154,8 @@
- Environment setup
*/
+#define CONFIG_BOOTDELAY 5
- /* 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} " \@@ -182,7 +186,6 @@ "else " \ "if run loaduimage; then " \ "run mmcboot; " \
"else run nandboot; " \ "fi; " \