summaryrefslogtreecommitdiffstats
path: root/include/configs/cm5200.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-12 14:27:39 +0200
committerWolfgang Denk <wd@denx.de>2007-08-12 14:27:39 +0200
commitafaac86fe2948ac84cd9a12bbed883b3c683e7d9 (patch)
tree118aab58be50d1f42d983c0e93c21c8975962b3a /include/configs/cm5200.h
parent308e2b3a6c3fd84fceada79b3d4a559280d326a6 (diff)
downloadblackbird-obmc-uboot-afaac86fe2948ac84cd9a12bbed883b3c683e7d9.tar.gz
blackbird-obmc-uboot-afaac86fe2948ac84cd9a12bbed883b3c683e7d9.zip
Clean up some remaining CFG_CMD_ -> CONFIG_CMD_ issues.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/cm5200.h')
-rw-r--r--include/configs/cm5200.h39
1 files changed, 17 insertions, 22 deletions
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 76628560e5..56c0ecb4d9 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -35,27 +35,22 @@
/*
* Supported commands
*/
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_ECHO | \
- CFG_CMD_I2C | \
- CFG_CMD_FLASH | \
- CFG_CMD_MII | \
- CFG_CMD_NFS | \
- CFG_CMD_PING | \
- CFG_CMD_DIAG | \
- CFG_CMD_REGINFO | \
- CFG_CMD_SNTP | \
- CFG_CMD_BSP | \
- CFG_CMD_USB | \
- CFG_CMD_FAT | \
- CFG_CMD_JFFS2)
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_SNTP
+#define CONFIG_CMD_USB
/*
* Serial console configuration
@@ -344,7 +339,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#ifdef CONFIG_CMD_KGDB
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
OpenPOWER on IntegriCloud