ARMV7: Update default environment for OMAP4 boards
authorSteve Sakoman <steve@sakoman.com>
Wed, 7 Jul 2010 22:25:25 +0000 (15:25 -0700)
committerSandeep Paulraj <s-paulraj@ti.com>
Thu, 5 Aug 2010 14:11:50 +0000 (10:11 -0400)
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>
include/configs/omap4_panda.h
include/configs/omap4_sdp4430.h

index 1d76467277d50fe701d72ef27e41ca6cb62faaac..a0d27a437d567a309b8165c53357ae86b45f389c 100644 (file)
  * Environment setup
  */
 
+#define CONFIG_BOOTDELAY       3
+
 /* allow overwriting serial config and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
        "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" \
                "else " \
                        "if run loaduimage; then " \
                                "run mmcboot; " \
-                       "else run nandboot; " \
                        "fi; " \
                "fi; " \
        "fi"
index e9909f91b108d0bfba85aa571494d7189221e66c..d5439f988a316f125684d47a53c4457a790f35fa 100644 (file)
  * Environment setup
  */
 
+#define CONFIG_BOOTDELAY       3
+
 /* allow overwriting serial config and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
        "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" \
                "else " \
                        "if run loaduimage; then " \
                                "run mmcboot; " \
-                       "else run nandboot; " \
                        "fi; " \
                "fi; " \
        "fi"