summaryrefslogtreecommitdiff
path: root/include/configs/sbc8260.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:30:58 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:18 +0200
commit866e3089bfc826bb4dc74637f8aad87a3bab79fc (patch)
tree632d61b55c126c12055fa7be309f64349e9aead1 /include/configs/sbc8260.h
parent2694690e285acaa34922f55f4b5ae030da60c55a (diff)
downloadu-boot-imx-866e3089bfc826bb4dc74637f8aad87a3bab79fc.zip
u-boot-imx-866e3089bfc826bb4dc74637f8aad87a3bab79fc.tar.gz
u-boot-imx-866e3089bfc826bb4dc74637f8aad87a3bab79fc.tar.bz2
include/configs: Use new CONFIG_CMD_* in sbc* board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/sbc8260.h')
-rw-r--r--include/configs/sbc8260.h47
1 files changed, 22 insertions, 25 deletions
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 9cf0654..2a209d3 100644
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -444,27 +444,26 @@
*/
#define CONFIG_VERSION_VARIABLE
-/* What U-Boot subsytems do you want enabled? */
-#ifdef CONFIG_ETHER_ON_FCC
-# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
- CFG_CMD_ASKENV | \
- CFG_CMD_ELF | \
- CFG_CMD_I2C | \
- CFG_CMD_IMMAP | \
- CFG_CMD_MII | \
- CFG_CMD_PING | \
- CFG_CMD_REGINFO | \
- CFG_CMD_SDRAM )
-#else
-# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
- CFG_CMD_ASKENV | \
- CFG_CMD_ELF | \
- CFG_CMD_I2C | \
- CFG_CMD_IMMAP | \
- CFG_CMD_PING | \
- CFG_CMD_REGINFO | \
- CFG_CMD_SDRAM )
-#endif /* CONFIG_ETHER_ON_FCC */
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_SDRAM
+
+#undef CONFIG_CMD_KGDB
+
+#if defined(CONFIG_ETHER_ON_FCC)
+ #define CONFIG_CMD_CMD_MII
+#endif
+
#undef CONFIG_WATCHDOG /* disable the watchdog */
@@ -481,13 +480,11 @@
#define CONFIG_SBC8260 1 /* on an EST SBC8260 Board */
#define CONFIG_CPM2 1 /* Has a CPM2 */
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
/*
* Miscellaneous configurable options
*/
-#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 */
@@ -627,7 +624,7 @@
*/
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif