summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:31:35 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:29 +0200
commitb730cda82e362df6a22f4c59c0a9b97e885b1014 (patch)
treefe8bc5ab45f76607dbb85f96f3a3077474694c8f
parentd794cfefead5fc177cf4f41164e80382e9c9484a (diff)
downloadu-boot-imx-b730cda82e362df6a22f4c59c0a9b97e885b1014.zip
u-boot-imx-b730cda82e362df6a22f4c59c0a9b97e885b1014.tar.gz
u-boot-imx-b730cda82e362df6a22f4c59c0a9b97e885b1014.tar.bz2
include/configs: Use new CONFIG_CMD_* in mpc5xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
-rw-r--r--include/configs/cmi_mpc5xx.h25
1 files changed, 18 insertions, 7 deletions
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index e459919..dbc41e9 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -44,13 +44,24 @@
#define CONFIG_BAUDRATE 57600
-#define CONFIG_COMMANDS (CFG_CMD_MEMORY | CFG_CMD_LOADB | CFG_CMD_REGINFO | \
- CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_ASKENV | \
- CFG_CMD_BDI | CFG_CMD_CONSOLE | CFG_CMD_ENV | CFG_CMD_RUN | \
- CFG_CMD_IMI)
-/* 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_MEMORY
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_CONSOLE
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_RUN
+#define CONFIG_CMD_IMI
+
#if 0
#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
@@ -73,7 +84,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 */