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

[u-boot] / include / configs / rut.h

diff --git a/include/configs/rut.h b/include/configs/rut.h
index bf2cc2f2bbfa8e8a6a73a1d64ce0041a32ad6b2e..aea8e217d019eafc0b3e174451f0e917f43ee36a 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -56,6 +56,7 @@
 /* Default env settings */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "hostname=rut\0" \
+       "ubi_off=2048\0"\
        "nand_img_size=0x500000\0" \
        "splashpos=m,m\0" \
        "optargs=fixrtc --no-log consoleblank=0 \0" \
@@ -85,7 +86,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY               3
 
 #define CONFIG_BOOTCOMMAND \
        "if mmc rescan; then " \
@@ -107,7 +107,6 @@
        "reset;"
 
 #else
-#define CONFIG_BOOTDELAY               0
 
 #define CONFIG_BOOTCOMMAND                     \
        "setenv autoload no; "                  \