summaryrefslogtreecommitdiffstats
path: root/include/configs/R360MPI.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-08 15:12:40 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-08 16:05:39 -0500
commite9a0f8f15c11f337967aa0600ad6e8af33037f50 (patch)
treece956f729e6db3ad0994a955a18c0d3d31ecf33c /include/configs/R360MPI.h
parent12aa9fd23d724bd6ab88e1baa0db35133a27303f (diff)
downloadblackbird-obmc-uboot-e9a0f8f15c11f337967aa0600ad6e8af33037f50.tar.gz
blackbird-obmc-uboot-e9a0f8f15c11f337967aa0600ad6e8af33037f50.zip
include/configs: Use new CONFIG_CMD_* in various R* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/R360MPI.h')
-rw-r--r--include/configs/R360MPI.h35
1 files changed, 19 insertions, 16 deletions
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index 82228c0126..c00ed3d4c0 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -111,20 +111,23 @@
#define CFG_I2C_KEY_ADDR 0x9 /* Keyboard coprocessor */
#define CFG_I2C_TEM_ADDR 0x49 /* Temperature Sensors */
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_BMP | \
- CFG_CMD_BSP | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_I2C | \
- CFG_CMD_IDE | \
- CFG_CMD_JFFS2 | \
- CFG_CMD_NFS | \
- CFG_CMD_PCMCIA | \
- CFG_CMD_SNTP )
-
-/* 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_BMP
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PCMCIA
+#define CONFIG_CMD_SNTP
+
/*
* Miscellaneous configurable options
@@ -134,7 +137,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 */
@@ -228,7 +231,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif
OpenPOWER on IntegriCloud