Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / include / configs / omap4_panda.h

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 1d76467277d50fe701d72ef27e41ca6cb62faaac..a0d27a437d567a309b8165c53357ae86b45f389c 100644 (file)
--- 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"