summaryrefslogtreecommitdiff
path: root/include/configs/ZUMA.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/ZUMA.h
parentfe7f782d5b8c64a0195c68c31a0a11d4f641355e (diff)
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/ZUMA.h')
-rw-r--r--include/configs/ZUMA.h25
1 files changed, 14 insertions, 11 deletions
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index f163d003b..662093834 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -106,12 +106,18 @@
#define CONFIG_MII /* enable MII commands */
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_BSP | \
- CFG_CMD_JFFS2 | \
- CFG_CMD_MII | \
- CFG_CMD_DATE)
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_DATE
+
/*
* JFFS2 partitions
@@ -131,15 +137,12 @@
#define MTDPARTS_DEFAULT "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)"
*/
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
/*
* 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 */
@@ -349,7 +352,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 32 /* For all MPC74xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif