summaryrefslogtreecommitdiff
path: root/include/configs/Adder.h
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
committerMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
commit85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch)
tree3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /include/configs/Adder.h
parent706714d97a0d08d59eda4de2268c39f504688329 (diff)
parentb23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff)
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/Adder.h')
-rw-r--r--include/configs/Adder.h29
1 files changed, 20 insertions, 9 deletions
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 0e6b50f8b0e..4304ecca7de 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -52,15 +52,26 @@
#define CFG_8xx_CPUCLK_MAX 133000000
#endif /* CONFIG_MPC852T */
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
- | CFG_CMD_DHCP \
- | CFG_CMD_IMMAP \
- | CFG_CMD_MII \
- | CFG_CMD_PING \
- )
-
-/* This must be included AFTER the definition of CONFIG_COMMANDS */
-#include <cmd_confdefs.h>
+
+/*
+ * 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_DHCP
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+
#define CONFIG_BOOTDELAY 5 /* Autoboot after 5 seconds */
#define CONFIG_BOOTCOMMAND "bootm fe040000" /* Autoboot command */