include/configs: Use new CONFIG_CMD_* in various B* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

diff --git a/include/configs/B2.h b/include/configs/B2.h
index e55858d34bc071417f612dd87567a6c33d4b906a..244ad4ffb7723c38b036dc9a876b85f4d777ac32 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -74,14 +74,17 @@
 
 #define CONFIG_BOOTP_MASK       (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
 
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL | \
-                                                               CFG_CMD_DATE | \
-                                                               CFG_CMD_ELF     | \
-                                                               CFG_CMD_EEPROM  | \
-                                                               CFG_CMD_I2C     )
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_I2C
+
 
 #define CONFIG_BOOTDELAY       5
 #define CONFIG_ETHADDR 00:50:c2:1e:af:fb

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 46bdfa2ee62c880c53558440dbb299a36343e1f9..2569c9148313d1744dbdd76c03d40063d142a13d 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -68,12 +68,19 @@
 
 #define CONFIG_BOOTP_MASK       (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
 
-#define CONFIG_COMMANDS         (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_JFFS2 |\
-                                CFG_CMD_SCSI   | CFG_CMD_IDE | CFG_CMD_DATE  |\
-                                CFG_CMD_FDC    | CFG_CMD_ELF)
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_SCSI  
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_DATE 
+#define CONFIG_CMD_FDC   
+#define CONFIG_CMD_ELF
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 /*
  * Miscellaneous configurable options
@@ -86,7 +93,7 @@
  */
 #define CONFIG_CONS_INDEX       1
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE              1024        /* Console I/O Buffer Size */
 #else
 #define CFG_CBSIZE              256         /* Console I/O Buffer Size */
@@ -436,7 +443,7 @@ extern  unsigned long           bab7xx_get_gclk_freq (void);
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE        32    /* For all MPC74xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT        5    /* log base 2 of the above value */
 #endif
 

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index bc30977fd7ad416bf8443e5b4c06bb72327b55eb..00b656e737dbe03ef9f69e2ce0d29c3b734a7c9d 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -61,11 +61,6 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                  */
 
-#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs                 */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value    */
-#endif
-
 /*
  * Serial console configuration
  */
@@ -106,12 +101,6 @@
 #define CFG_RX_ETH_BUFFER      8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
 
-#ifdef CONFIG_PCI
-# define ADD_PCI_CMD           CFG_CMD_PCI
-#else
-# define ADD_PCI_CMD           0
-#endif
-
 /*
  * Video console
  */
@@ -126,12 +115,6 @@
 # define CONFIG_SPLASH_SCREEN
 # define CFG_CONSOLE_IS_IN_ENV
 
-#ifdef CONFIG_VIDEO
-# define ADD_BMP_CMD           CFG_CMD_BMP
-#else
-# define ADD_BMP_CMD           0
-#endif
-
 /*
  * Partitions
  */
@@ -144,10 +127,7 @@
  */
 #ifdef CONFIG_BC3450_USB
 # define CONFIG_USB_OHCI
-# define ADD_USB_CMD           CFG_CMD_USB
 # define CONFIG_USB_STORAGE
-#else /* !CONFIG_BC3450_USB */
-# define ADD_USB_CMD           0
 #endif /* CONFIG_BC3450_USB */
 
 /*
@@ -165,59 +145,53 @@
 # define CFG_CMD_POST_DIAG 0
 #endif /* CONFIG_POST */
 
+
 /*
- * IDE
+ * Command line configuration.
  */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_POST_DIAG
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_SNTP
+#define CONFIG_CMD_BSP
+
+#ifdef CONFIG_VIDEO
+    #define CONFIG_CMD_BMP
+#endif
+
 #ifdef CONFIG_BC3450_IDE
-# define ADD_IDE_CMD           CFG_CMD_IDE
-#else
-# define ADD_IDE_CMD           0
-#endif /* CONFIG_BC3450_IDE */
+    #define CONFIG_CMD_IDE
+#endif
 
-/*
- * Filesystem support
- */
-#if defined (CONFIG_BC3450_IDE) || defined (CONFIG_BC3450_USB)
-#ifdef CONFIG_FAT
-# define ADD_FAT_CMD           CFG_CMD_FAT
-#else
-# define ADD_FAT_CMD           0
-#endif /* CONFIG_FAT */
+#if defined(CONFIG_BC3450_IDE) || defined(CONFIG_BC3450_USB)
+    #ifdef CONFIG_FAT
+       #define CONFIG_CMD_FAT
+    #endif
 
-#ifdef CONFIG_EXT2
-# define ADD_EXT2_CMD          CFG_CMD_EXT2
-#else
-# define ADD_EXT2_CMD          0
-#endif /* CONFIG_EXT2 */
-#endif /* CONFIG_BC3450_IDE / _USB */
+    #ifdef CONFIG_EXT2
+       #define CONFIG_CMD_EXT2
+    #endif
+#endif
+
+#ifdef CONFIG_BC3450_USB
+    #define CONFIG_CMD_USB
+#endif
+                       
+#ifdef CONFIG_PCI
+    #define CONFIG_CMD_PCI
+#endif
 
-/*
- * Supported commands
- */
-#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
-                               ADD_BMP_CMD     | \
-                               ADD_IDE_CMD     | \
-                               ADD_FAT_CMD     | \
-                               ADD_EXT2_CMD    | \
-                               ADD_PCI_CMD     | \
-                               ADD_USB_CMD     | \
-                               CFG_CMD_ASKENV  | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_ECHO    | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_JFFS2   | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_POST_DIAG | \
-                               CFG_CMD_REGINFO | \
-                               CFG_CMD_SNTP    | \
-                               CFG_CMD_BSP)
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CONFIG_TIMESTAMP               /* display image timestamps */
 
@@ -450,7 +424,7 @@
  */
 #define CFG_LONGHELP                           /* undef to save memory     */
 #define CFG_PROMPT             "=> "           /* Monitor Command Prompt   */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE             1024            /* Console I/O Buffer Size  */
 #else
 #define CFG_CBSIZE             256             /* Console I/O Buffer Size  */
@@ -469,6 +443,11 @@
 
 #define CFG_HZ                 1000            /* dec freq: 1ms ticks      */
 
+#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs                 */
+#if defined(CONFIG_CMD_KGDB)
+#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value    */
+#endif
+
 /*
  * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
  * which is normally part of the default commands (CFV_CMD_DFL)

diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 3bd43d836930aaaee01924ea3bc3d367b663cec6..b062316a09bd5c4641d3fb55a817b7b6a7dcbb34 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -64,28 +64,26 @@
 #define CFG_DOC_SUPPORT_2000    1
 #define CFG_DOC_SUPPORT_MILLENNIUM 1
 #define CFG_DOC_SHORT_TIMEOUT    1
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_DOC     | \
-                               CFG_CMD_ELF     | \
-                               0 )
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DOC
+#define CONFIG_CMD_ELF
+
 
 /* CFG_CMD_DOC required legacy NAND support */
 #define CFG_NAND_LEGACY
 
 #if 0
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | CFG_CMD_DHCP | \
-                                CFG_CMD_PCI | CFG_CMD_DOC | CFG_CMD_DATE)
-
 #define CONFIG_PCI             1
 #define CONFIG_PCI_PNP         1       /* PCI plug-and-play */
 #endif
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
- */
-#include <cmd_confdefs.h>
-
-
 /*
  * Miscellaneous configurable options
  */
@@ -293,7 +291,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value   */
 #endif