include/configs/[P-Z]*: 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>

38 files changed, 336 insertions, 13 deletions

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index b0f86157de..0de7591da6 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -41,6 +41,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_MEMORY
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 2dfd231173..d6e7082f6a 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.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/PCI5441.h b/include/configs/PCI5441.h
index 1bfcd37d06..24b25d9850 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -124,6 +124,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/PIP405.h b/include/configs/PIP405.h
index 0a2d7d7f9d..efa015746e 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -42,6 +42,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/PK1C20.h b/include/configs/PK1C20.h
index 49a285c5d1..d90351add3 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.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.
  */
 
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 5742db6f2a..54703731af 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.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/PM520.h b/include/configs/PM520.h
index 3cd3511f78..5ba8f4a4e2 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.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/PM854.h b/include/configs/PM854.h
index d79dd768f9..dbf94228ae 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -305,6 +305,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/PM856.h b/include/configs/PM856.h
index 5681d43369..6bdfa5d8f1 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -308,6 +308,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/PMC405.h b/include/configs/PMC405.h
index bdbc900ba0..b29f368f57 100644
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -65,6 +65,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/PN62.h b/include/configs/PN62.h
index 8346d8ca02..72acf5ae8d 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -43,6 +43,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/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 709ce5f0e9..dd1decdcd9 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -115,6 +115,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/RPXsuper.h b/include/configs/RPXsuper.h
index 1401da35ab..dfadd2a11f 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -151,6 +151,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/Rattler.h b/include/configs/Rattler.h
index 5bdf57193b..d7652fa9ba 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -127,6 +127,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>
@@ -207,7 +216,7 @@
 #define MTDIDS_DEFAULT		"nor0=rattler-0"
 #define MTDPARTS_DEFAULT	"mtdparts=rattler-0:-@1m(jffs2)"
 */
-#endif /* CFG_CMD_JFFS2 */
+#endif /* CONFIG_CMD_JFFS2 */
 
 #define CFG_MONITOR_BASE	TEXT_BASE
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index a5397c2e08..f2c3699ab7 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -340,6 +340,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/SL8245.h b/include/configs/SL8245.h
index b8e5c7de73..4d9d41b927 100644
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -55,6 +55,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/SX1.h b/include/configs/SX1.h
index 588d3459e0..05cef873e5 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -95,6 +95,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/SXNI855T.h b/include/configs/SXNI855T.h
index efc500ca5b..8f2a5ece2c 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -148,6 +148,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/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index d19c27e84b..5bbe3c5919 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -82,6 +82,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/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index cbad484b07..a08451eb30 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -53,6 +53,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/TASREG.h b/include/configs/TASREG.h
index b0116e7acd..2b2ae01f63 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -52,6 +52,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/TB5200.h b/include/configs/TB5200.h
index 3d90efb1c1..1c6a9ae4f1 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -88,6 +88,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>
@@ -408,8 +417,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * 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/TOP5200.h b/include/configs/TOP5200.h
index 73d25ea868..7240ce1283 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -100,6 +100,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/TQM5200.h b/include/configs/TQM5200.h
index 598c1c61c6..63d77e2941 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -148,6 +148,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>
@@ -580,8 +589,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * 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/TQM8272.h b/include/configs/TQM8272.h
index 05e2e9ac18..50f67524fd 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -97,10 +97,6 @@
 /* enable I2C and select the hardware/software driver */
 #undef  CONFIG_HARD_I2C			/* I2C with hardware support	*/
 #define CONFIG_SOFT_I2C		1	/* I2C bit-banged		*/
-#define ADD_CMD_I2C		CFG_CMD_I2C	| \
-				CFG_CMD_DATE	|\
-				CFG_CMD_DTT	|\
-				CFG_CMD_EEPROM
 #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CFG_I2C_SLAVE		0x7F
 
@@ -140,7 +136,6 @@
 #else
 #undef CONFIG_HARD_I2C
 #undef CONFIG_SOFT_I2C
-#define ADD_CMD_I2C		0
 #endif
 
 /*
@@ -295,6 +290,13 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 
+#if CONFIG_I2C
+    #define CONFIG_CMD_I2C
+    #define CONFIG_CMD_DATE
+    #define CONFIG_CMD_DTT
+    #define CONFIG_CMD_EEPROM
+#endif
+
 
 /*
  * Miscellaneous configurable options
@@ -439,7 +441,7 @@
 	WRITE_NAND(d, addr); \
 } while(0)
 
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
 
 #define	CONFIG_PCI
 #ifdef CONFIG_PCI
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 684cb30456..c3efb7bb9c 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -316,6 +316,15 @@ extern int tqm834x_num_flash_banks;
 #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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index b17d5e30fc..d5ce3ba716 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -359,6 +359,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/TQM885D.h b/include/configs/TQM885D.h
index 19fdaf0b6b..f36b729cd5 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -198,8 +198,7 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
- * Enable loopw commando. This has only effect, 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/Total5200.h b/include/configs/Total5200.h
index 2a1cb89ad4..9edf79022d 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -111,6 +111,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/VCMA9.h b/include/configs/VCMA9.h
index ab802a3cd5..df6894f324 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -50,6 +50,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/VOH405.h b/include/configs/VOH405.h
index 3f2c32b6b2..34f0ebdcfa 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.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/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index ebe634f133..14057847b8 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -138,6 +138,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/W7OLMC.h b/include/configs/W7OLMC.h
index fd810961d0..fc177fb1f5 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -71,6 +71,15 @@
 #define CONFIG_RTC_M48T35A	1		/* ST Electronics M48 timekeeper */
 
 /*
+ * 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/W7OLMG.h b/include/configs/W7OLMG.h
index a5ce685412..20d693fa47 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -77,6 +77,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/WUH405.h b/include/configs/WUH405.h
index f7865200c1..c1b3da863e 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.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/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 4b8fbe6f4d..611f5a62ca 100644
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -184,6 +184,15 @@ extern void out32(unsigned int, unsigned long);
 
 
 /*
+ * 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/Yukon8220.h b/include/configs/Yukon8220.h
index 07fab44314..00c4ff093a 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.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/ZPC1900.h b/include/configs/ZPC1900.h
index fb5bc0fdb3..7c1a5b9e88 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -108,6 +108,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>