summaryrefslogtreecommitdiff
path: root/include/configs/virtlab2.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:33:46 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:05:18 +0200
commitdca3b3d6d6396b67e5e84af53452164923c73443 (patch)
tree5042b752f194f2e2ce3668c41d92837c656be811 /include/configs/virtlab2.h
parent6c18eb9804b525f3e4f3bb3d014dd69a200d9fa7 (diff)
downloadu-boot-imx-dca3b3d6d6396b67e5e84af53452164923c73443.zip
u-boot-imx-dca3b3d6d6396b67e5e84af53452164923c73443.tar.gz
u-boot-imx-dca3b3d6d6396b67e5e84af53452164923c73443.tar.bz2
include/configs: Use new CONFIG_CMD_* in various [v-z]* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/virtlab2.h')
-rw-r--r--include/configs/virtlab2.h38
1 files changed, 17 insertions, 21 deletions
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 06d8536..ac87b39 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -96,27 +96,23 @@
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
-#ifdef CONFIG_SPLASH_SCREEN
-# define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_BMP | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_IDE | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP )
-#else
-# define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_IDE | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP )
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SNTP
+
+#if defined(CONFIG_SPLASH_SCREEN)
+ #define CONFIG_CMD_BMP
#endif
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
/*
* Miscellaneous configurable options
@@ -131,7 +127,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 */
@@ -214,7 +210,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