summaryrefslogtreecommitdiff
path: root/include/configs/mp2usb.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:33:01 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:05:02 +0200
commit5dc11a511960d490f7f01ffd746edfe6277f99b0 (patch)
treec12bd9d9f7898f5d56077986dda1ddf40613ca99 /include/configs/mp2usb.h
parent9bbb1c0820c1fbd3811ab6ee4ba0f6c6f76b27e4 (diff)
downloadu-boot-imx-5dc11a511960d490f7f01ffd746edfe6277f99b0.zip
u-boot-imx-5dc11a511960d490f7f01ffd746edfe6277f99b0.tar.gz
u-boot-imx-5dc11a511960d490f7f01ffd746edfe6277f99b0.tar.bz2
include/configs: Use new CONFIG_CMD_* in various m* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/mp2usb.h')
-rw-r--r--include/configs/mp2usb.h62
1 files changed, 35 insertions, 27 deletions
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 04f1f24..3a62240 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -123,36 +123,44 @@
#define CONFIG_BOOTDELAY 3
-#ifdef CONFIG_HARD_I2C
-#define CONFIG_COMMANDS \
- ((CONFIG_CMD_DFL | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_EEPROM | \
- CFG_CMD_I2C | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP | \
- CFG_CMD_MISC))
-#else
-#define CONFIG_COMMANDS \
- ((CONFIG_CMD_DFL | \
- CFG_CMD_DHCP | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP | \
- CFG_CMD_USB | \
- CFG_CMD_CACHE) & \
- ~(CFG_CMD_BDI | \
- CFG_CMD_IMI | \
- CFG_CMD_AUTOSCRIPT | \
- CFG_CMD_FPGA | \
- CFG_CMD_MISC | \
- CFG_CMD_LOADS ))
+
+#if !defined(CONFIG_HARD_I2C)
#define CONFIG_TIMESTAMP
#endif
-#define CFG_LONGHELP
-/* 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_DHCP
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SNTP
+
+#if defined(CONFIG_HARD_I2C)
+
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_EEPROM
+ #define CONFIG_CMD_I2C
+ #define CONFIG_CMD_MISC
+
+#else
+
+ #define CONFIG_CMD_USB
+ #define CONFIG_CMD_CACHE
+
+ #undef CONFIG_CMD_AUTOSCRIPT
+ #undef CONFIG_CMD_BDI
+ #undef CONFIG_CMD_FPGA
+ #undef CONFIG_CMD_IMI
+ #undef CONFIG_CMD_LOADS
+ #undef CONFIG_CMD_MISC
+
+#endif
+
+
+#define CFG_LONGHELP
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM 0x20000000