summaryrefslogtreecommitdiff
path: root/include/configs/CANBT.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-05 19:52:35 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-07 20:30:36 -0500
commit49cf7e8ee7ef943fdfe866ce28410b0bfbf6a26c (patch)
tree15c093e1452b7b7dc3854da115004f631b01f288 /include/configs/CANBT.h
parentde8b2a6e33298dcdb10bdda48db25e53c3089eba (diff)
downloadu-boot-49cf7e8ee7ef943fdfe866ce28410b0bfbf6a26c.tar.gz
u-boot-49cf7e8ee7ef943fdfe866ce28410b0bfbf6a26c.tar.bz2
u-boot-49cf7e8ee7ef943fdfe866ce28410b0bfbf6a26c.zip
include/configs: Use new CONFIG_CMD_* in various C* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/CANBT.h')
-rw-r--r--include/configs/CANBT.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index e0262a8f67..8e09c52764 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -56,13 +56,17 @@
#define CONFIG_PHY_ADDR 0 /* PHY address */
-#define CONFIG_COMMANDS (( CONFIG_CMD_DFL | \
- CFG_CMD_IRQ | \
- CFG_CMD_EEPROM ) & \
- ~CFG_CMD_NET)
-/* 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_IRQ
+#define CONFIG_CMD_EEPROM
+
+#undef CONFIG_CMD_NET
+
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@ -73,7 +77,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 */
@@ -173,7 +177,7 @@
*/
#define CFG_DCACHE_SIZE 8192 /* For AMCC 405 CPUs */
#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