Merge git://git.denx.de/u-boot-nand-flash

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

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 07c8abe2a79bd197ad92165f2bdfc45ba1340cee..748e3317a7ef550c394594e624eb9a0e9aea3eac 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -124,7 +124,6 @@
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_BOOTDELAY                       3
 
 /*
  * U-Boot Environment placing definitions.
@@ -146,7 +145,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