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

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 07c8abe..4af6b67 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -104,7 +104,6 @@
 /* USB EHCI options */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_SPEAR
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /*
@@ -124,7 +123,6 @@
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_BOOTDELAY                       3
 
 /*
  * U-Boot Environment placing definitions.
@@ -146,7 +144,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands      */
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000