From 11799434c5ff15a612577bb1ad1f4ea1a0595e4b Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 09:02:57 -0500
Subject: [PATCH] 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>
---
include/configs/A3000.h | 9 +++++++++
include/configs/ADCIOP.h | 9 +++++++++
include/configs/ADNPESC1.h | 9 +++++++++
include/configs/AP1000.h | 8 ++++++++
include/configs/APC405.h | 9 +++++++++
include/configs/AR405.h | 9 +++++++++
include/configs/ASH405.h | 9 +++++++++
include/configs/Adder.h | 9 +++++++++
include/configs/Alaska8220.h | 9 +++++++++
include/configs/BC3450.h | 12 ++++++++++--
include/configs/BMW.h | 11 ++++++++++-
include/configs/CANBT.h | 9 +++++++++
include/configs/CATcenter.h | 9 +++++++++
include/configs/CPCI2DP.h | 9 +++++++++
include/configs/CPCI440.h | 9 +++++++++
include/configs/CPCIISER4.h | 18 ++++++++++++++++++
include/configs/DASA_SIM.h | 9 +++++++++
include/configs/DK1C20.h | 9 +++++++++
include/configs/DK1S10.h | 9 +++++++++
include/configs/DP405.h | 9 +++++++++
include/configs/DU405.h | 9 +++++++++
include/configs/EB+MCF-EV123.h | 9 +++++++++
include/configs/EP1C20.h | 9 +++++++++
include/configs/EP1S10.h | 9 +++++++++
include/configs/EP1S40.h | 9 +++++++++
include/configs/EP88x.h | 9 +++++++++
include/configs/ERIC.h | 9 +++++++++
include/configs/EXBITGEN.h | 9 +++++++++
include/configs/FADS823.h | 1 -
include/configs/FADS850SAR.h | 9 +++++++++
include/configs/G2000.h | 9 +++++++++
include/configs/GENIETV.h | 9 +++++++++
include/configs/GTH.h | 9 +++++++++
include/configs/HH405.h | 17 +++++++++++++----
include/configs/HIDDEN_DRAGON.h | 9 +++++++++
include/configs/HUB405.h | 9 +++++++++
include/configs/IDS8247.h | 2 +-
include/configs/ISPAN.h | 9 +++++++++
include/configs/IceCube.h | 25 +++++++++++++++----------
39 files changed, 354 insertions(+), 19 deletions(-)
diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index eb07490766..0a9a1ff90c 100644
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -53,6 +53,15 @@
#define CONFIG_BOOTDELAY 5
+/*
+ * 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/ADCIOP.h b/include/configs/ADCIOP.h
index f79fad1861..46329918ef 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 0635506e62..d4ee14c837 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 015699dbdc..d25aa74a45 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -67,6 +67,14 @@
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
+/*
+ * 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/APC405.h b/include/configs/APC405.h
index 5ac86bef86..6dcfbc15d4 100644
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -68,6 +68,15 @@
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
+/*
+ * 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/AR405.h b/include/configs/AR405.h
index 785f945505..0f301ec0c6 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -72,6 +72,15 @@
#define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */
+/*
+ * 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/ASH405.h b/include/configs/ASH405.h
index f0ec761ebb..9e0ee371c2 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -60,6 +60,15 @@
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
+/*
+ * 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/Adder.h b/include/configs/Adder.h
index 9a429442fd..5e076dcc41 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -53,6 +53,15 @@
#endif /* CONFIG_MPC852T */
+/*
+ * 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/Alaska8220.h b/include/configs/Alaska8220.h
index e47872d27e..3f2f6140f6 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -65,6 +65,15 @@
#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.
*/
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index aec4d83f25..844bdc5d88 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -143,6 +143,15 @@
#endif /* CONFIG_POST */
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
/*
* Command line configuration.
*/
@@ -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 b062316a09..bb7856f675 100644
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -66,6 +66,15 @@
#define CFG_DOC_SHORT_TIMEOUT 1
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
/*
* Command line configuration.
*/
@@ -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 8e09c52764..0e082b318b 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -57,6 +57,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.
*/
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 33c8b1c2d7..62a2eaa236 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -120,6 +120,15 @@
#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.
*/
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index def2646cc2..a3717b9052 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -54,6 +54,15 @@
#define CONFIG_MII 1 /* MII PHY management */
#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.
*/
diff --git a/include/configs/CPCI440.h b/include/configs/CPCI440.h
index 73b3e8a6eb..318ada1a4f 100644
--- a/include/configs/CPCI440.h
+++ b/include/configs/CPCI440.h
@@ -173,6 +173,15 @@
#define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */
+/*
+ * 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/CPCIISER4.h b/include/configs/CPCIISER4.h
index e0b4d8c178..c7b623a1d6 100644
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -55,6 +55,24 @@
#define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */
+/*
+ * 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.
*/
diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index b1638ce1a2..627ea14826 100644
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -58,6 +58,15 @@
#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/DK1C20.h b/include/configs/DK1C20.h
index c3bd2cb841..0ddf0e3aeb 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -447,6 +447,15 @@
#define CFG_NIOS_ASMIBASE CFG_NIOS_CPU_ASMI0 /* ASMI base address */
+/*
+ * 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/DK1S10.h b/include/configs/DK1S10.h
index a5530a6c8d..0032fd3db7 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -454,6 +454,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.
*/
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index b50d4f905b..2eadbea35d 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -56,6 +56,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.
*/
diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 2093b37364..5c595f57d2 100644
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -59,6 +59,15 @@
#define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */
+/*
+ * 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/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 07f31d52c0..a8697ec88d 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -69,6 +69,15 @@
#endif
+/*
+ * 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/EP1C20.h b/include/configs/EP1C20.h
index db133c6440..cfa6335927 100644
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -161,6 +161,15 @@
#define CONFIG_SERVERIP 192.168.2.16
+/*
+ * 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/EP1S10.h b/include/configs/EP1S10.h
index 67a162d9d3..7c526f759e 100644
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -155,6 +155,15 @@
#define CONFIG_SERVERIP 192.168.2.16
+/*
+ * 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/EP1S40.h b/include/configs/EP1S40.h
index 2363835b9f..1fe8f68c2e 100644
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -155,6 +155,15 @@
#define CONFIG_SERVERIP 192.168.2.16
+/*
+ * 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/EP88x.h b/include/configs/EP88x.h
index 60a45086d6..89e0eebeea 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -50,6 +50,15 @@
#define CFG_8xx_CPUCLK_MIN 40000000
#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.
*/
diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index 2320747c36..5d48d2bbb6 100644
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -97,6 +97,15 @@
#define CONFIG_PHY_ADDR 1 /* PHY address */
+/*
+ * 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/EXBITGEN.h b/include/configs/EXBITGEN.h
index fdbf125822..a3f38bb3a3 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -83,6 +83,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.
*/
diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index bc3957629c..a562b2fa4e 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 c2238c9a96..c8ce25957b 100644
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -62,6 +62,15 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */
+/*
+ * 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/G2000.h b/include/configs/G2000.h
index 24eff02ac6..9c713c6c26 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -89,6 +89,15 @@
#endif
+/*
+ * 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/GENIETV.h b/include/configs/GENIETV.h
index 67525db331..785355a8e6 100644
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -106,6 +106,15 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */
+/*
+ * 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/GTH.h b/include/configs/GTH.h
index f398bad79a..79f5714e6f 100644
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -98,6 +98,15 @@
#endif
+/*
+ * 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/HH405.h b/include/configs/HH405.h
index 58f29cd666..00f481c4b5 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 972ca0884f..26dd954c18 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -53,6 +53,15 @@
#define CONFIG_DRAM_SPEED 100 /* MHz */
+/*
+ * 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/HUB405.h b/include/configs/HUB405.h
index d29bddbe1c..661b895f9a 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -61,6 +61,15 @@
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
+/*
+ * 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/IDS8247.h b/include/configs/IDS8247.h
index 455bbe3f63..85d2bb3f51 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 e6ef765662..965b515f0e 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -106,6 +106,15 @@
#define CONFIG_BAUDRATE 38400
+/*
+ * 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/IceCube.h b/include/configs/IceCube.h
index c80c2d4ad3..cc902c842d 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,15 +86,21 @@
/* 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.
*/
@@ -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 */
--
2.39.5