summaryrefslogtreecommitdiff
path: root/include/configs/ZPC1900.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-08 15:31:57 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-08 16:05:43 -0500
commita5562901661bd428f7e5feb333f796372cb81019 (patch)
tree830226f1bc8e6b223100d11c999a9d20b6acc5fe /include/configs/ZPC1900.h
parentfe7f782d5b8c64a0195c68c31a0a11d4f641355e (diff)
downloadu-boot-imx-a5562901661bd428f7e5feb333f796372cb81019.zip
u-boot-imx-a5562901661bd428f7e5feb333f796372cb81019.tar.gz
u-boot-imx-a5562901661bd428f7e5feb333f796372cb81019.tar.bz2
include/configs: Use new CONFIG_CMD_* in various [TUVWZYZ]* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/ZPC1900.h')
-rw-r--r--include/configs/ZPC1900.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 2b02fe7..30c7790 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -106,22 +106,24 @@
#define CONFIG_BAUDRATE 38400
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
- | CFG_CMD_ASKENV \
- | CFG_CMD_DHCP \
- | CFG_CMD_IMMAP \
- | CFG_CMD_MII \
- | CFG_CMD_PING \
- )
-/* 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_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOOTCOMMAND "dhcp;bootm" /* autoboot command */
#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=:::::eth0:dhcp"
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
#define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
#undef CONFIG_KGDB_NONE /* define if kgdb on something else */
@@ -139,7 +141,7 @@
#define CFG_PROMPT_HUSH_PS2 "> "
#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 */
@@ -223,7 +225,7 @@
#endif
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif