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

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

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index de6ff7f74499deb336e444dc71cebae050dd4e59..ffae107a9a8313e3514c0b38336f1f8948dca5db 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -31,7 +31,6 @@
 #define CONFIG_SYS_CLK_FREQ    33330000 /* external frequency to pll   */
 
 #define CONFIG_BAUDRATE                9600
-#define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds     */
 
 #undef CONFIG_BOOTARGS
 #undef CONFIG_BOOTCOMMAND
@@ -68,9 +67,7 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_MII
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 
@@ -124,8 +121,6 @@
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
-
 #define CONFIG_VERSION_VARIABLE 1      /* include version env variable */
 
 #define CONFIG_SYS_RX_ETH_BUFFER       16      /* use 16 rx buffer on 405 emac */