summaryrefslogtreecommitdiff
path: root/include/configs/ppmc8260.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:33:17 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:05:08 +0200
commit26a34560d56a9df5bc2ae23525d9229736134757 (patch)
tree06fcb6de3b59643f20aca5b0d72f6da758378ae7 /include/configs/ppmc8260.h
parenta5cb23092a7d31490a33d4ec871468b63babfa3c (diff)
downloadu-boot-imx-26a34560d56a9df5bc2ae23525d9229736134757.zip
u-boot-imx-26a34560d56a9df5bc2ae23525d9229736134757.tar.gz
u-boot-imx-26a34560d56a9df5bc2ae23525d9229736134757.tar.bz2
include/configs: Use new CONFIG_CMD_* in various p* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/ppmc8260.h')
-rw-r--r--include/configs/ppmc8260.h29
1 files changed, 16 insertions, 13 deletions
diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index d671dcc..d99da2f 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -275,14 +275,20 @@
/* Monitor Command Prompt */
#define CFG_PROMPT "=> "
-/* What U-Boot subsytems do you want enabled? */
-#define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
- CFG_CMD_ELF | \
- CFG_CMD_ASKENV | \
- CFG_CMD_REGINFO | \
- CFG_CMD_MEMTEST | \
- CFG_CMD_MII | \
- CFG_CMD_IMMAP)
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_MEMTEST
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_IMMAP
+
+#undef CONFIG_CMD_KGDB
/* Where do the internal registers live? */
@@ -298,13 +304,10 @@
#define CONFIG_PPMC8260 1 /* on an Wind River PPMC8260 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 */
@@ -477,7 +480,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