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 0067ea46e0ccbfe8a0a319fbd991b96833d5b587..aea8e217d019eafc0b3e174451f0e917f43ee36a 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -45,29 +45,23 @@
 
 #define CONFIG_FACTORYSET
 
-/* UBI Support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#endif
-
 /* Watchdog */
 #define WATCHDOG_TRIGGER_GPIO  14
 
 #ifndef CONFIG_SPL_BUILD
 
+/* Use common default */
+#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V1
+
 /* 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" \
-       CONFIG_COMMON_ENV_SETTINGS \
+       CONFIG_ENV_SETTINGS_V1 \
+       CONFIG_ENV_SETTINGS_NAND_V1 \
        "mmc_dev=0\0" \
        "mmc_root=/dev/mmcblk0p2 rw\0" \
        "mmc_root_fs_type=ext4 rootwait\0" \
@@ -92,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 " \
@@ -114,7 +107,6 @@
        "reset;"
 
 #else
-#define CONFIG_BOOTDELAY               0
 
 #define CONFIG_BOOTCOMMAND                     \
        "setenv autoload no; "                  \
@@ -154,8 +146,4 @@
 #define CONFIG_SYS_CONSOLE_FG_COL      0x00
 #endif
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_FIT
-#endif
-
 #endif /* ! __CONFIG_RUT_H */