summaryrefslogtreecommitdiff
path: root/include/configs/NETPHONE.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-08 14:21:43 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-08 16:05:32 -0500
commite18a1061a8630cb67995fdf99afd3fb50d1b187d (patch)
treeddd66f520a2280e4acca42f01eba7c8eeb219261 /include/configs/NETPHONE.h
parent8353e139bfad9059c54f5b2421f1a3090e15a2e2 (diff)
include/configs: Use new CONFIG_CMD_* in various [NO]* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/NETPHONE.h')
-rw-r--r--include/configs/NETPHONE.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 444f721cc85..cfca8114d73 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -105,20 +105,22 @@
#define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_NAND | \
- CFG_CMD_DHCP | \
- CFG_CMD_PING | \
- CFG_CMD_MII | \
- CFG_CMD_CDP \
- )
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_CDP
+
#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_MISC_INIT_R
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
/*
* Miscellaneous configurable options
*/
@@ -128,7 +130,7 @@
#define CFG_HUSH_PARSER 1
#define CFG_PROMPT_HUSH_PS2 "> "
-#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 */
@@ -220,7 +222,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif