summaryrefslogtreecommitdiff
path: root/include/configs/hermes.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:32:25 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:55 +0200
commit48d5d102a2f2e619c92050b9aedbb69689185bc0 (patch)
tree8fc33933506af19e6e4df2d103c00a6bde1b8d76 /include/configs/hermes.h
parent72eb0efaed7048afcc61fc6f0085c49394b5dc36 (diff)
downloadu-boot-imx-48d5d102a2f2e619c92050b9aedbb69689185bc0.zip
u-boot-imx-48d5d102a2f2e619c92050b9aedbb69689185bc0.tar.gz
u-boot-imx-48d5d102a2f2e619c92050b9aedbb69689185bc0.tar.bz2
include/configs: Use new CONFIG_CMD_* in various h* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/hermes.h')
-rw-r--r--include/configs/hermes.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index 91117ba..f1cc8d2 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -64,23 +64,21 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_COMMANDS CONFIG_CMD_DFL
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-/*----------------------------------------------------------------------*/
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-/*----------------------------------------------------------------------*/
+#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
/*
* Miscellaneous configurable options
*/
#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 */
@@ -157,7 +155,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