summaryrefslogtreecommitdiff
path: root/include/configs/IP860.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-08 13:46:18 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-08 16:05:28 -0500
commit348f258f24253433e4a2302a0bbceb6740a67246 (patch)
tree45ba7b5fb90325cd20dd680d4da4711746e6937f /include/configs/IP860.h
parent6c4f4da9bfc9f9403f54fce678ed0364b7c86a6a (diff)
include/configs: Use new CONFIG_CMD_* in various [IJKL]* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/IP860.h')
-rw-r--r--include/configs/IP860.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 0e20e567634..07c7955d14d 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -88,28 +88,26 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_BEDBUG | \
- CFG_CMD_I2C | \
- CFG_CMD_EEPROM | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP )
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-/*----------------------------------------------------------------------*/
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SNTP
-/*----------------------------------------------------------------------*/
+#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
/*
* Miscellaneous configurable options
*/
#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 */
@@ -202,7 +200,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