summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:31:07 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:21 +0200
commitef0df52ab49eea4a30c15087fd27d54c1d946f2c (patch)
tree08aebce9dda28e1f7521b3c5d2b095d9b395d807 /include/configs
parent866e3089bfc826bb4dc74637f8aad87a3bab79fc (diff)
downloadu-boot-imx-ef0df52ab49eea4a30c15087fd27d54c1d946f2c.zip
u-boot-imx-ef0df52ab49eea4a30c15087fd27d54c1d946f2c.tar.gz
u-boot-imx-ef0df52ab49eea4a30c15087fd27d54c1d946f2c.tar.bz2
include/configs: Use new CONFIG_CMD_* in STx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/stxssa.h6
-rw-r--r--include/configs/stxxtc.h25
2 files changed, 17 insertions, 14 deletions
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index c88d534..f480bd5 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -357,7 +357,7 @@
*/
#define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "SSA=> " /* 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 */
@@ -378,7 +378,7 @@
/* Cache Configuration */
#define CFG_DCACHE_SIZE 32768
#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
@@ -390,7 +390,7 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 614a046..d0d8581 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -100,19 +100,22 @@
#define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_NAND | \
- CFG_CMD_DHCP | \
- CFG_CMD_PING | \
- CFG_CMD_MII | \
- CFG_CMD_NFS)
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+
#define CONFIG_BOARD_EARLY_INIT_F 1
#define CONFIG_MISC_INIT_R
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
/*
* Miscellaneous configurable options
*/
@@ -122,7 +125,7 @@
#define CFG_HUSH_PARSER 1
#define CFG_PROMPT_HUSH_PS2 "> "
-#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 */
@@ -213,7 +216,7 @@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif