common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option

[people/ms/u-boot.git] / include / configs / warp7.h

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index d1404b2555be72a20a4bc36fd829b65c40b6461f..f112fa5f1627b7dbf73f40a3e2896b6b5305010e 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -9,14 +9,12 @@
 #ifndef __WARP7_CONFIG_H
 #define __WARP7_CONFIG_H
 
-#define CONFIG_BOOTDELAY                1
 #include "mx7_common.h"
 
 #define PHYS_SDRAM_SIZE                        SZ_512M
 
 #define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
 
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
@@ -84,7 +82,6 @@
                   "fi; " \
           "fi"
 
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x20000000)
 
@@ -119,7 +116,6 @@
 #define CONFIG_MMCROOT                 "/dev/mmcblk2p2"
 
 /* USB Configs */
-#define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX7
 #define CONFIG_USB_STORAGE
@@ -136,7 +132,6 @@
 #define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_USB_GADGET
-#define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_VBUS_DRAW    2
@@ -146,7 +141,6 @@
 #define CONFIG_G_DNL_MANUFACTURER      "FSL"
 
 /* USB Device Firmware Update support */
-#define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_MMC
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_16M