summaryrefslogtreecommitdiff
path: root/include/configs/shannon.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:33:30 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:05:13 +0200
commit46da1e96b7db14f4fcd2c92544e7c0862024bc76 (patch)
tree796323dd9f5b1b9d193dafc038ae8c26ed53cad3 /include/configs/shannon.h
parent90cc3eb6d2be856d9ddd81436de9cf343bc6b5c8 (diff)
include/configs: Use new CONFIG_CMD_* in various s* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/shannon.h')
-rw-r--r--include/configs/shannon.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 572985b051b..cad38d0c00d 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -66,21 +66,19 @@
#define CONFIG_BAUDRATE 115200
-#if 0 /* XXX - cannot test IDE anyway, so disabled for now - wd */
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_PCMCIA | \
- CFG_CMD_IDE)
-#endif /* 0 */
-/* 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_BOOTDELAY 3
#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200"
#define CONFIG_NETMASK 255.255.0.0
#define CONFIG_BOOTCOMMAND "help"
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif