summaryrefslogtreecommitdiff
path: root/include/configs/delta.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:32:03 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:42 +0200
commitab999ba1b31ebe78dd16374394a55d7c6e5aa6e4 (patch)
tree0c321aadd08c8db9fc005fc8bf702570c1cf55cb /include/configs/delta.h
parent37e4f24b87fa255ae456d193b7cd23c18dd1d56b (diff)
downloadu-boot-imx-ab999ba1b31ebe78dd16374394a55d7c6e5aa6e4.zip
u-boot-imx-ab999ba1b31ebe78dd16374394a55d7c6e5aa6e4.tar.gz
u-boot-imx-ab999ba1b31ebe78dd16374394a55d7c6e5aa6e4.tar.bz2
include/configs: Use new CONFIG_CMD_* in various d* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/delta.h')
-rw-r--r--include/configs/delta.h32
1 files changed, 19 insertions, 13 deletions
diff --git a/include/configs/delta.h b/include/configs/delta.h
index 1568120..7df7280 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -87,22 +87,28 @@
#define CONFIG_BAUDRATE 115200
-/* #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_MMC | CFG_CMD_FAT) */
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
#ifdef TURN_ON_ETHERNET
-# define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING)
+
+#define CONFIG_CMD_PING
+
#else
-# define CONFIG_COMMANDS ((CONFIG_CMD_DFL \
- | CFG_CMD_ENV \
- | CFG_CMD_NAND \
- | CFG_CMD_I2C) \
- & ~(CFG_CMD_NET \
- | CFG_CMD_FLASH \
- | CFG_CMD_IMLS))
-#endif
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_I2C
+
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_IMLS
+
+#endif
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY -1
#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
@@ -114,7 +120,7 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_TIMESTAMP
-#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