summaryrefslogtreecommitdiff
path: root/include/configs/G2000.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-07 21:04:26 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-08 16:05:23 -0500
commit60a0876b5106b34220e459c208bbf648073306c0 (patch)
treefb1ad9b8623eba4fa8a4021f2a28f33e330f49e9 /include/configs/G2000.h
parentdcaa71562826a2466e894c868d132509dcda8444 (diff)
downloadu-boot-imx-60a0876b5106b34220e459c208bbf648073306c0.zip
u-boot-imx-60a0876b5106b34220e459c208bbf648073306c0.tar.gz
u-boot-imx-60a0876b5106b34220e459c208bbf648073306c0.tar.bz2
include/configs: Use new CONFIG_CMD_* in various F* and G* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/G2000.h')
-rw-r--r--include/configs/G2000.h35
1 files changed, 19 insertions, 16 deletions
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index db42fd0..24eff02 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -88,20 +88,23 @@
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
#endif
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_DHCP | \
- CFG_CMD_PCI | \
- CFG_CMD_IRQ | \
- CFG_CMD_ELF | \
- CFG_CMD_DATE | \
- CFG_CMD_I2C | \
- CFG_CMD_MII | \
- CFG_CMD_PING | \
- CFG_CMD_BSP | \
- CFG_CMD_EEPROM )
-
-/* 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_PCI
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_EEPROM
+
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@ -120,7 +123,7 @@
#define CFG_PROMPT_HUSH_PS2 "> "
#endif
-#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 */
@@ -324,7 +327,7 @@
#define CFG_DCACHE_SIZE 16384 /* For AMCC 405 CPUs, older 405 ppc's */
/* have only 8kB, 16kB is save here */
#define CFG_CACHELINE_SIZE 32 /* ... */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif