summaryrefslogtreecommitdiffstats
path: root/include/configs/AR405.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-05 19:13:52 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-07 20:28:28 -0500
commit498ff9a228485bd4b9f23d066bada268f9add1dd (patch)
tree8c83bf9d31475b293462558a843e2d2b9384f855 /include/configs/AR405.h
parentdcc0264878406d52b879d2e5a63d3d793371434e (diff)
downloadblackbird-obmc-uboot-498ff9a228485bd4b9f23d066bada268f9add1dd.tar.gz
blackbird-obmc-uboot-498ff9a228485bd4b9f23d066bada268f9add1dd.zip
include/configs: Use new CONFIG_CMD_* in various A* named board config files.
Since ADS860.h includes "board/fads/fads.h" with ramifications on the CONFIG_COMMAND treatment, it too has to be adjusted to exclude already configured commands in this same commit. Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/AR405.h')
-rw-r--r--include/configs/AR405.h29
1 files changed, 16 insertions, 13 deletions
diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 1cd0280e21..785f945505 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -71,17 +71,20 @@
#define CONFIG_PHY_ADDR 0 /* PHY address */
#define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_DHCP | \
- CFG_CMD_PCI | \
- CFG_CMD_IRQ | \
- CFG_CMD_ELF | \
- CFG_CMD_MII | \
- CFG_CMD_PING | \
- CFG_CMD_BSP )
-
-/* 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_MII
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_BSP
+
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@ -92,7 +95,7 @@
*/
#define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */
-#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 */
@@ -207,7 +210,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
OpenPOWER on IntegriCloud