drivers/mtd: Move conditional compilation to Makefile

[karo-tx-uboot.git] / include / configs / kvme080.h

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 61cf70576d779be607a1a82a1969cc94060487ba..819e456e459d14f2cbef8105ac6ac608d7cbcfa4 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -60,32 +60,44 @@
 
 #undef CONFIG_WATCHDOG
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_RTC_DS164x
 
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL        | \
-                                 CFG_CMD_ASKENV        | \
-                                 CFG_CMD_CACHE         | \
-                                 CFG_CMD_DATE          | \
-                                 CFG_CMD_DHCP          | \
-                                 CFG_CMD_DIAG          | \
-                                 CFG_CMD_EEPROM        | \
-                                 CFG_CMD_ELF           | \
-                                 CFG_CMD_I2C           | \
-                                 CFG_CMD_JFFS2         | \
-                                 CFG_CMD_NFS           | \
-                                 CFG_CMD_PCI           | \
-                                 CFG_CMD_PING          | \
-                                 CFG_CMD_SDRAM         | \
-                                 CFG_CMD_SNTP)
 
-#define CONFIG_NETCONSOLE
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_SNTP
 
-#include <cmd_confdefs.h>
+
+#define CONFIG_NETCONSOLE
 
 #define CFG_LONGHELP
 #define CFG_PROMPT             "=> "
@@ -130,7 +142,7 @@
 #define CFG_BOOTMAPSZ          (8 << 20)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION
 #define CFG_FLASH_EMPTY_INFO
@@ -178,7 +190,7 @@
 #define CONFIG_SYS_CLK_FREQ    33333333
 
 #define CFG_CACHELINE_SIZE     32
-#if CONFIG_COMMANDS & CFG_CMD_KGDB
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5
 #endif