summaryrefslogtreecommitdiff
path: root/include/configs/smdk2400.h
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2007-08-03 02:23:23 -0500
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2007-08-03 02:23:23 -0500
commit6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch)
tree4bc9e1362c3090bb6d2df71109228ca61b8d00ce /include/configs/smdk2400.h
parent5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff)
parent5dc210dec5bace98a50b6ba905347890091a9bb0 (diff)
downloadu-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip
u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.gz
u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.bz2
Merge branch 'testing' into working
Conflicts: CHANGELOG fs/fat/fat.c include/configs/MPC8560ADS.h include/configs/pcs440ep.h net/eth.c
Diffstat (limited to 'include/configs/smdk2400.h')
-rw-r--r--include/configs/smdk2400.h38
1 files changed, 23 insertions, 15 deletions
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index a137f9d..05f6053 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -86,24 +86,32 @@
/* Use s3c2400's RTC */
#define CONFIG_RTC_S3C24X0 1
-#ifndef USE_920T_MMU
-#define CONFIG_COMMANDS_tmp ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
- CFG_CMD_DATE | \
- CFG_CMD_SNTP )
-#else
-#define CONFIG_COMMANDS_tmp (CONFIG_CMD_DFL | \
- CFG_CMD_DATE | \
- CFG_CMD_SNTP )
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_SNTP
+
+#if defined(CONFIG_HWFLOW)
+ #define CONFIG_CONFIG_HWFLOW
#endif
-#ifdef CONFIG_HWFLOW
-#define CONFIG_COMMANDS (CONFIG_COMMANDS_tmp | CFG_CMD_HWFLOW)
-#else
-#define CONFIG_COMMANDS CONFIG_COMMANDS_tmp
+#if !defined(USE_920T_MMU)
+ #undef CONFIG_CMD_CACHE
#endif
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY 3
#if 0
@@ -118,7 +126,7 @@
#define CONFIG_BOOTCOMMAND "tftp; bootm"
#endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
/* what's this ? it's not used anywhere */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */