summaryrefslogtreecommitdiff
path: root/include/configs/jupiter.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-07-04 22:32:51 -0500
committerWolfgang Denk <wd@denx.de>2007-07-05 11:04:58 +0200
commitbc234c129fa04fb9fa33530930e5cbc6084cd47a (patch)
treeab433773e028bc3d3afea63ff7c89b1dc16545a3 /include/configs/jupiter.h
parent1d2c6bc491969f8d8fb34c8e30e8bea7a2af9c31 (diff)
downloadu-boot-imx-bc234c129fa04fb9fa33530930e5cbc6084cd47a.zip
u-boot-imx-bc234c129fa04fb9fa33530930e5cbc6084cd47a.tar.gz
u-boot-imx-bc234c129fa04fb9fa33530930e5cbc6084cd47a.tar.bz2
include/configs: Use new CONFIG_CMD_* in various j* and k* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/jupiter.h')
-rw-r--r--include/configs/jupiter.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 5b97526..e53b848 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -41,11 +41,6 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
-#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
-#endif
-
/*
* Serial console configuration
*/
@@ -87,15 +82,15 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
+
/*
- * Supported commands
+ * Command line configuration.
*/
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_NFS | \
- CFG_CMD_SNTP)
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SNTP
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
/*
* Autobooting
@@ -254,7 +249,7 @@
#ifdef CFG_HUSH_PARSER
#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 */
@@ -271,6 +266,11 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
+#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
+#if defined(CONFIG_CMD_KGDB)
+# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
+#endif
+
/*
* Various low-level settings
*/