summaryrefslogtreecommitdiffstats
path: root/include/configs/idmr.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:32:32 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:57 +0200
commit1d2c6bc491969f8d8fb34c8e30e8bea7a2af9c31 (patch)
tree0faef1955b9b92dad5e7d5729e3e5c1b7c79d606 /include/configs/idmr.h
parent48d5d102a2f2e619c92050b9aedbb69689185bc0 (diff)
downloadtalos-obmc-uboot-1d2c6bc491969f8d8fb34c8e30e8bea7a2af9c31.tar.gz
talos-obmc-uboot-1d2c6bc491969f8d8fb34c8e30e8bea7a2af9c31.zip
include/configs: Use new CONFIG_CMD_* in various i* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/idmr.h')
-rw-r--r--include/configs/idmr.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index b1dbe2ccb9..9926633463 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -78,18 +78,18 @@
"u-boot=/tftpboot/idmr/u-boot.bin\0" \
""
+
/*
- * Commands' definition
+ * Command line configuration.
*/
-#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \
- CFG_CMD_PING | \
- CFG_CMD_JFFS2 | \
- CFG_CMD_NET) & \
- ~(CFG_CMD_LOADS | \
- CFG_CMD_LOADB))
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_NET
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_LOADB
/*
@@ -115,11 +115,11 @@
#define CFG_PROMPT "=> "
#define CFG_LONGHELP /* undef to save memory */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
-#else /* !(CONFIG_COMMANDS & CFG_CMD_KGDB) */
+#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
-#endif /* (CONFIG_COMMANDS & CFG_CMD_KGDB) */
+#endif
#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
#define CFG_MAXARGS 16 /* max number of command args */
@@ -206,8 +206,8 @@
"2m(rootfs)," \
"-(user)";
-#if (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_CMD_MII)
#error MII commands don't work on iDMR board and sholud not be enabled.
-#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) */
+#endif
#endif /* _IDMR_H */
OpenPOWER on IntegriCloud