summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-10 09:02:57 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-10 09:03:20 -0500
commit11799434c5ff15a612577bb1ad1f4ea1a0595e4b (patch)
treed73708537e669618cb12ba667b888764554680a2
parent1fe80d79c5c4e52d3410a7ab4b8515da095cdab3 (diff)
include/configs/[A-I]*: Cleanup BOOTP and lingering CFG_CMD_*.
Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h used to be included but CONFIG_BOOTP_MASK was not defined. Remove lingering references to CFG_CMD_* symbols. Signed-off-by: Jon Loeliger <jdl@freescale.com>
-rw-r--r--include/configs/A3000.h9
-rw-r--r--include/configs/ADCIOP.h9
-rw-r--r--include/configs/ADNPESC1.h9
-rw-r--r--include/configs/AP1000.h8
-rw-r--r--include/configs/APC405.h9
-rw-r--r--include/configs/AR405.h9
-rw-r--r--include/configs/ASH405.h9
-rw-r--r--include/configs/Adder.h9
-rw-r--r--include/configs/Alaska8220.h9
-rw-r--r--include/configs/BC3450.h12
-rw-r--r--include/configs/BMW.h11
-rw-r--r--include/configs/CANBT.h9
-rw-r--r--include/configs/CATcenter.h9
-rw-r--r--include/configs/CPCI2DP.h9
-rw-r--r--include/configs/CPCI440.h9
-rw-r--r--include/configs/CPCIISER4.h18
-rw-r--r--include/configs/DASA_SIM.h9
-rw-r--r--include/configs/DK1C20.h9
-rw-r--r--include/configs/DK1S10.h9
-rw-r--r--include/configs/DP405.h9
-rw-r--r--include/configs/DU405.h9
-rw-r--r--include/configs/EB+MCF-EV123.h9
-rw-r--r--include/configs/EP1C20.h9
-rw-r--r--include/configs/EP1S10.h9
-rw-r--r--include/configs/EP1S40.h9
-rw-r--r--include/configs/EP88x.h9
-rw-r--r--include/configs/ERIC.h9
-rw-r--r--include/configs/EXBITGEN.h9
-rw-r--r--include/configs/FADS823.h1
-rw-r--r--include/configs/FADS850SAR.h9
-rw-r--r--include/configs/G2000.h9
-rw-r--r--include/configs/GENIETV.h9
-rw-r--r--include/configs/GTH.h9
-rw-r--r--include/configs/HH405.h17
-rw-r--r--include/configs/HIDDEN_DRAGON.h9
-rw-r--r--include/configs/HUB405.h9
-rw-r--r--include/configs/IDS8247.h2
-rw-r--r--include/configs/ISPAN.h9
-rw-r--r--include/configs/IceCube.h25
39 files changed, 354 insertions, 19 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index eb074907666..0a9a1ff90c8 100644
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -54,6 +54,15 @@
/*
+ * 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>
diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index f79fad18612..46329918ef1 100644
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -59,6 +59,15 @@
#define CONFIG_IPADDR 10.0.18.222
#define CONFIG_SERVERIP 10.0.18.190
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
/*
* Command line configuration.
*/
diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index 0635506e628..d4ee14c837f 100644
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -564,6 +564,15 @@
#define CFG_NIOS_POST_WORD_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
/*
* Command line configuration.
*/
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index 015699dbdcf..d25aa74a452 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -68,6 +68,14 @@
/*
+ * 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>
diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 5ac86bef860..6dcfbc15d4c 100644
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -69,6 +69,15 @@
/*
+ * 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>
diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 785f9455051..0f301ec0c6a 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -73,6 +73,15 @@
/*
+ * 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>
diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index f0ec761ebb5..9e0ee371c2c 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -61,6 +61,15 @@
/*
+ * 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>
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 9a429442fd9..5e076dcc41c 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -54,6 +54,15 @@
/*
+ * 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>
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index e47872d27ea..3f2f6140f63 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -66,6 +66,15 @@
/*
+ * 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>
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index aec4d83f251..844bdc5d883 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -144,6 +144,15 @@
/*
+ * 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>
@@ -449,8 +458,7 @@
#endif
/*
- * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
- * which is normally part of the default commands (CFV_CMD_DFL)
+ * Enable loopw command.
*/
#define CONFIG_LOOPW
diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index b062316a09b..bb7856f675d 100644
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -67,6 +67,15 @@
/*
+ * 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>
@@ -76,7 +85,7 @@
#define CONFIG_CMD_ELF
-/* CFG_CMD_DOC required legacy NAND support */
+/* CONFIG_CMD_DOC required legacy NAND support */
#define CFG_NAND_LEGACY
#if 0
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index 8e09c527646..0e082b318bb 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -58,6 +58,15 @@
/*
+ * 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>
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 33c8b1c2d7b..62a2eaa2365 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -121,6 +121,15 @@
/*
+ * 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>
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index def2646cc20..a3717b9052f 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -55,6 +55,15 @@
#define CONFIG_PHY_ADDR 0 /* PHY address */
/*
+ * 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>
diff --git a/include/configs/CPCI440.h b/include/configs/CPCI440.h
index 73b3e8a6ebe..318ada1a4fb 100644
--- a/include/configs/CPCI440.h
+++ b/include/configs/CPCI440.h
@@ -174,6 +174,15 @@
/*
+ * 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>
diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index e0b4d8c178e..c7b623a1d6d 100644
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -56,6 +56,24 @@
/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * 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>
diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index b1638ce1a29..627ea14826b 100644
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -59,6 +59,15 @@
/*
+ * 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>
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index c3bd2cb8415..0ddf0e3aeb9 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -448,6 +448,15 @@
/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
* Command line configuration.
*/
#include <config_cmd_all.h>
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index a5530a6c8dc..0032fd3db71 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -455,6 +455,15 @@
#endif /* CFG_NIOS_CPU_PIO_NUMS */
/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
* Command line configuration.
*/
#include <config_cmd_all.h>
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index b50d4f905b6..2eadbea35d6 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -57,6 +57,15 @@
/*
+ * 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>
diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 2093b373644..5c595f57d26 100644
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -60,6 +60,15 @@
/*
+ * 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>
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 07f31d52c07..a8697ec88de 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -70,6 +70,15 @@
/*
+ * 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>
diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h
index db133c64407..cfa6335927a 100644
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -162,6 +162,15 @@
/*
+ * 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>
diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h
index 67a162d9d3a..7c526f759e7 100644
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -156,6 +156,15 @@
/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
* Command line configuration.
*/
#define CONFIG_CMD_BDI
diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h
index 2363835b9f4..1fe8f68c2e6 100644
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -156,6 +156,15 @@
/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
* Command line configuration.
*/
#define CONFIG_CMD_BDI
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 60a45086d65..89e0eebeead 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -51,6 +51,15 @@
#define CFG_8xx_CPUCLK_MAX 133000000
/*
+ * 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>
diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index 2320747c36d..5d48d2bbb68 100644
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -98,6 +98,15 @@
/*
+ * 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>
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index fdbf1258229..a3f38bb3a32 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -84,6 +84,15 @@
/*
+ * 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>
diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index bc3957629ca..a562b2fa4e8 100644
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -46,7 +46,6 @@
#define CFG_I2C_SPEED 400000 /* I2C speed and slave address */
#define CFG_I2C_SLAVE 0x7F
-/*Now included by CFG_CMD_PCMCIA */
/*#define CONFIG_PCMCIA 1 / * To enable PCMCIA support */
/* Video related */
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index c2238c9a96c..c8ce25957b0 100644
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -63,6 +63,15 @@
/*
+ * 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>
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 24eff02ac66..9c713c6c26f 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -90,6 +90,15 @@
/*
+ * 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>
diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index 67525db3312..785355a8e66 100644
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -107,6 +107,15 @@
/*
+ * 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>
diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index f398bad79a0..79f5714e6f0 100644
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -99,6 +99,15 @@
/*
+ * 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>
diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 58f29cd6667..00f481c4b52 100644
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -98,11 +98,18 @@
#define CONFIG_VIDEO_BMP_GZIP /* gzip compressed bmp images */
#define CFG_VIDEO_LOGO_MAX_SIZE (2 << 20) /* for decompressed img */
-#define ADD_BMP_CMD CFG_CMD_BMP
-#else
-#define ADD_BMP_CMD 0
#endif /* CONFIG_VIDEO */
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
/*
* Command line configuration.
*/
@@ -120,9 +127,11 @@
#define CONFIG_CMD_DATE
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_BMP_CMD
#define CONFIG_CMD_EEPROM
+#ifdef CONFIG_VIDEO
+#define CONFIG_CMD_BMP
+#endif
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 972ca0884f2..26dd954c18a 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -54,6 +54,15 @@
/*
+ * 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>
diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index d29bddbe1ca..661b895f9a1 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -62,6 +62,15 @@
/*
+ * 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>
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 455bbe3f633..85d2bb3f513 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -303,7 +303,7 @@
#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)(adr + 0x0)) = (__u8)d; } while(0)
#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)(adr + 0x0)))
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
/*-----------------------------------------------------------------------
* Hard Reset Configuration Words
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index e6ef7656629..965b515f0e6 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -107,6 +107,15 @@
/*
+ * 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>
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index c80c2d4ad3c..cc902c842d5 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -64,7 +64,6 @@
#define CONFIG_PCI_IO_BUS 0x50000000
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0x01000000
-#define ADD_PCI_CMD CFG_CMD_PCI
#endif
#define CFG_XLB_PIPELINING 1
@@ -75,11 +74,8 @@
#define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
#define CONFIG_NS8382X 1
-#else /* MPC5100 */
-
+#else
#define CONFIG_MII 1
-#define ADD_PCI_CMD 0 /* no CFG_CMD_PCI */
-
#endif
/* Partitions */
@@ -90,16 +86,22 @@
/* USB */
#if 1
#define CONFIG_USB_OHCI
-#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
#define CONFIG_USB_STORAGE
-#else
-#define ADD_USB_CMD 0
#endif
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/*
+ * 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>
@@ -110,8 +112,11 @@
#define CONFIG_CMD_IDE
#define CONFIG_CMD_NFS
#define CONFIG_CMD_SNTP
-#define CONFIG_PCI_CMD
-#define CONFIG_USB_CMD
+#define CONFIG_CMD_USB
+
+#if defined(CONFIG_PCI)
+#define CONFIG_CMD_PCI
+#endif
#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */