include/configs: Use new CONFIG_CMD_* in various n* named board config files.
authorJon Loeliger <jdl@jdl.com>
Thu, 5 Jul 2007 03:33:07 +0000 (22:33 -0500)
committerWolfgang Denk <wd@denx.de>
Thu, 5 Jul 2007 09:05:04 +0000 (11:05 +0200)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
include/configs/netstar.h
include/configs/ns9750dev.h

index 697796a11432c0709e80ccea1250054ca8a108aa..603c9b8be6417a297e76b2189d39c689308af23c 100644 (file)
 #define MTDIDS_DEFAULT         "nor0=omapflash.0,nand0=omapnand.0"
 #define MTDPARTS_DEFAULT       "mtdparts=omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);omapnand.0:48M(rootfs0),48M(rootfs1),-(data)"
 
-#if 0
-#define CONFIG_COMMANDS                (CFG_CMD_BDI    | \
-                                CFG_CMD_BOOTD  | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_ENV    | \
-                                CFG_CMD_FLASH  | \
-                                CFG_CMD_IMI    | \
-                                CFG_CMD_LOADB  | \
-                                CFG_CMD_NET    | \
-                                CFG_CMD_MEMORY | \
-                                CFG_CMD_PING   | \
-                                CFG_CMD_RUN)
 
-#else
-#define CONFIG_COMMANDS                (CFG_CMD_BDI    | \
-                                CFG_CMD_BOOTD  | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_ENV    | \
-                                CFG_CMD_FLASH  | \
-                                CFG_CMD_NAND   | \
-                                CFG_CMD_IMI    | \
-                                CFG_CMD_JFFS2  | \
-                                CFG_CMD_LOADB  | \
-                                CFG_CMD_NET    | \
-                                CFG_CMD_MEMORY | \
-                                CFG_CMD_PING   | \
-                                CFG_CMD_RUN)
+/*
+ * Command line configuration.
+ */
+
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_BOOTD
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_RUN
+
 
 #define CONFIG_JFFS2_NAND      1       /* jffs2 on nand support */
-#endif
 
 #define CONFIG_BOOTP_MASK      CONFIG_BOOTP_DEFAULT
 #define CONFIG_LOOPW
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* allow to break in always */
 #undef  CONFIG_BOOTARGS                /* the boot command will set bootargs*/
index 0b1541d5c346c86d4c3f64d710cc74344760299e..e1806a70c6093c81e4685cead8c8e3552463f966 100644 (file)
 
 #define CONFIG_BAUDRATE                38400
 
-/***********************************************************
- * Command definition
- ***********************************************************/
-#if 0 /* @TODO */
-#define CONFIG_COMMANDS \
-                       (CONFIG_CMD_DFL  | \
-                       CFG_CMD_CACHE    | \
-                       /*CFG_CMD_NAND   |*/ \
-                       /*CFG_CMD_EEPROM |*/ \
-                       /*CFG_CMD_I2C    |*/ \
-                       /*CFG_CMD_USB    |*/ \
-                       CFG_CMD_REGINFO  | \
-                       CFG_CMD_DATE     | \
-                       CFG_CMD_ELF)
-#else
-#define CONFIG_COMMANDS \
-                       (CONFIG_CMD_BDI | \
-                       CFG_CMD_NET | \
-                       CFG_CMD_PING     | \
-                       CFG_CMD_CONSOLE  | \
-                       CFG_CMD_LOADB    | \
-                       CFG_CMD_LOADS    | \
-                       CFG_CMD_MEMORY)
-#endif
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_CONSOLE
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+
 
 #define CONFIG_BOOTDELAY       3
 /*#define CONFIG_BOOTARGS      "root=ramfs devfs=mount console=ttySA0,9600" */
 /*#define CONFIG_BOOTFILE      "elinos-lart" */
 /*#define CONFIG_BOOTCOMMAND   "tftp; bootm" */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
 #define CONFIG_KGDB_SER_INDEX  1               /* which serial port to use */