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

[platform/kernel/u-boot.git] / include / configs / thuban.h

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 5fed55d..8d7b280 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -44,10 +44,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
-
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC
@@ -69,6 +65,7 @@
 /* Default env settings */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "hostname=thuban\0" \
+       "ubi_off=2048\0"\
        "nand_img_size=0x400000\0" \
        "optargs=\0" \
        "preboot=draco_led 0\0" \
@@ -78,7 +75,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY               3
 
 #define CONFIG_BOOTCOMMAND \
 "if dfubutton; then " \
@@ -90,7 +86,6 @@
 "reset;"
 
 #else
-#define CONFIG_BOOTDELAY               0
 
 #define CONFIG_BOOTCOMMAND                     \
        "setenv autoload no; "                  \