diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index b0f86157deba9f0274180a6a132047dc708dbc77..0de7591da660a7bee403d6fb0b303c9cb08f55fd 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -40,6 +40,15 @@
 #define CONFIG_BAUDRATE		9600
 
 
+/*
+ * 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/PCI405.h b/include/configs/PCI405.h
index 2dfd23117385bd920bba0968ceb85fee71b2376f..d6e7082f6a95e924e2932e37de414d2ce3c2b5f6 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -69,6 +69,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.
  */
diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 1bfcd37d06023e30b91cfad63d5055a5387d59cb..24b25d985003089a0dafc9d55abc4efb4e570201 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -123,6 +123,15 @@
 #define	CFG_HZ		(CONFIG_SYS_CLK_FREQ/(CFG_NIOS_TMRCNT + 1))
 
 
+/*
+ * 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/PIP405.h b/include/configs/PIP405.h
index 0a2d7d7f9d47f8358b39ce68cd3f8eb09fe3a3a9..efa015746e164cc8a6fe788e6d07f735106857ae 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -41,6 +41,15 @@
 #define CONFIG_SYS_CLK_FREQ	33000000 /* external frequency to pll	*/
 
 
+/*
+ * 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/PK1C20.h b/include/configs/PK1C20.h
index 49a285c5d1c08650086905603d4db01c66a3d8ac..d90351add35c80d15ed73e2a72f17579653dfda2 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.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/PLU405.h b/include/configs/PLU405.h
index 5742db6f2a2c850b454727d176c7c721e89efb3d..54703731af7467fe673ca1f3e87fa1dcca138f70 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -62,6 +62,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/PM520.h b/include/configs/PM520.h
index 3cd3511f7872639fca8bec05b1ad2858a7e5dcec..5ba8f4a4e2aa40d84d31d2303461bb328887ee4a 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.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/PM854.h b/include/configs/PM854.h
index d79dd768f90312cbc56c392ce553dab5efe5f0e5..dbf94228ae658fb09cbe08f83f5014a0579fe209 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -304,6 +304,15 @@
 #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/PM856.h b/include/configs/PM856.h
index 5681d433692919c926cc22ee40be3f1ea607cfc9..6bdfa5d8f1ff175807e1c64c7697fd582e72726f 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -307,6 +307,15 @@
 #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/PMC405.h b/include/configs/PMC405.h
index bdbc900ba0ce104467e2160d78d61b1191683270..b29f368f57c252aa1686718c90ec943002e69e8d 100644
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -64,6 +64,15 @@
 #define CONFIG_NETCONSOLE		/* include NetConsole support	*/
 
 
+/*
+ * 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/PN62.h b/include/configs/PN62.h
index 8346d8ca028b28d14bead9b9883b26b6cfcd77f7..72acf5ae8d57572f12bb6af6c9506ace4bab370d 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -42,6 +42,15 @@
 #define CONFIG_CONS_INDEX	1
 
 
+/*
+ * 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/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 709ce5f0e94c6d7b5a498806a0a671f2c091261a..dd1decdcd9499d9fc5344e03f04e8514c5eea16d 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -114,6 +114,15 @@
 #define CONFIG_PHY_CLK_FREQ	EMAC_STACR_CLK_66MHZ
 
 
+/*
+ * 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/RPXsuper.h b/include/configs/RPXsuper.h
index 1401da35abc49c8692990c00e91613c4cf69c721..dfadd2a11f06e8a4f1a21a4371f532f80d493e42 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -150,6 +150,15 @@
 #define CFG_PROMPT              "=> "
 
 
+/*
+ * 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/Rattler.h b/include/configs/Rattler.h
index 5bdf57193be83f5dc389245fa4618905dfe6b511..d7652fa9ba5c867321d267760348f16b7ff5df1c 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -126,6 +126,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.
  */
@@ -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 a5397c2e08bd693cf3e7124c43f8df92c6f77dc7..f2c3699ab744a48fda1f5ea0c87e645fb79c4dfc 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -339,6 +339,15 @@
 #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/SL8245.h b/include/configs/SL8245.h
index b8e5c7de7306a32bcf13264ab850e079f91f1e7c..4d9d41b9277bc578c7b56493b58c146d714f8559 100644
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -54,6 +54,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/SX1.h b/include/configs/SX1.h
index 588d3459e090fb6cea55f96614951a07897da437..05cef873e5febc3536b13aaaf1d78435fc6ece3b 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -94,6 +94,15 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 
+/*
+ * 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/SXNI855T.h b/include/configs/SXNI855T.h
index efc500ca5b3549bcc94304522cea383df13600dc..8f2a5ece2c733c62bcaf214cfb1300c4b589651e 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -147,6 +147,15 @@
 #define CFG_DISCOVER_PHY
 
 
+/*
+ * 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/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index d19c27e84b2de5c5e7308b3571db950a48bea250..5bbe3c5919d261faef084d51aa48e40269334abe 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -81,6 +81,15 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 
+/*
+ * 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/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index cbad484b072a8901f8c11acd30b1a3d58525590e..a08451eb30b7e3cafc8182765f37b37e6b92daa5 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -52,6 +52,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/TASREG.h b/include/configs/TASREG.h
index b0116e7acdad61981fa6ea3b09d5c951914261e3..2b2ae01f6350728f2a5bfcd7a399424a0ff74531 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -51,6 +51,15 @@
 #undef CONFIG_MONITOR_IS_IN_RAM	              /* no pre-loader required!!! ;-) */
 
 
+/*
+ * 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/TB5200.h b/include/configs/TB5200.h
index 3d90efb1c1754f06f170109f52b0e2820ecd6857..1c6a9ae4f1b8aaa42d5a24961559d4c097af4272 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -87,6 +87,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 73d25ea868e8161b582b6330a33bdcdd956a9f62..7240ce12835b57d43f750f2a6d6f0bf7a5fb655d 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -99,6 +99,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/TQM5200.h b/include/configs/TQM5200.h
index 598c1c61c6119a79bafb7e6c78db9cc12a2312a2..63d77e2941aa618bf0cfd6fbb713769594c1c8b6 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -147,6 +147,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 05e2e9ac18844f0323301767286ab174bdb81556..50f67524fded963abb1e4aaa3d42ba07eba2747f 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 684cb304568c51cfb6629d39cea16e59004a5005..c3efb7bb9c7a5cf3b61281e3b08268e7bfac9269 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -315,6 +315,15 @@ extern int tqm834x_num_flash_banks;
 #define CONFIG_LOADS_ECHO		1	/* echo on for serial download */
 #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/TQM85xx.h b/include/configs/TQM85xx.h
index b17d5e30fc950d68fc3ede1565615be2747addbe..d5ce3ba7169932d9c64df0c3a22068a4f473f72c 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -358,6 +358,15 @@
 #define	CONFIG_TIMESTAMP		/* Print image info with ts	*/
 
 
+/*
+ * 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/TQM885D.h b/include/configs/TQM885D.h
index 19fdaf0b6bc30dae8b0fa75e137434e661b76f37..f36b729cd5ef619adaccf4e2512a115d181564f0 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 2a1cb89ad4f2ea7781d7f31007b20a3135345ae4..9edf79022dc8b00b952bb8a8e17eeee60e18ad2f 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -110,6 +110,15 @@
 #define CONFIG_USB_STORAGE
 
 
+/*
+ * 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/VCMA9.h b/include/configs/VCMA9.h
index ab802a3cd58ce67fa749d491f68e6cc719cb3b24..df6894f3240a69451890281289d6e3e9c3e5b1b7 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -49,6 +49,15 @@
 #define CONFIG_INITRD_TAG	 1
 
 
+/*
+ * 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/VOH405.h b/include/configs/VOH405.h
index 3f2c32b6b25e39283e91cb78557f41eaba6ef51f..34f0ebdcfa2607b53ba27531bc2967a5e303f0ff 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -59,6 +59,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/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index ebe634f133c549b4211378feb568fe7c5cb32e69..14057847b82e655994a786d5a81648e9bd689f95 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -137,6 +137,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 fd810961d0ecedaf2ab23d26c8ff0f579787ee72..fc177fb1f560a5e52eadab8c9630452d88b0e1a3 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -70,6 +70,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.
  */
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index a5ce6854124114a1ed7733541da23b047c9d1712..20d693fa478e7a6383ac95d82557704df553c857 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -76,6 +76,15 @@
 #define CFG_DTT_HYSTERESIS	3
 
 
+/*
+ * 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/WUH405.h b/include/configs/WUH405.h
index f7865200c1e5757bc546e3fbd35262a7506937af..c1b3da863edab700e15e57e03a5e0fd3c0e98455 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.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/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 4b8fbe6f4d668ceb02eed62853ce5d32b6b1b7b8..611f5a62caa385af584ec79529a5a9b89ff1ba8b 100644
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -183,6 +183,15 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_HAS_ETH3		1	/* add support for "eth3addr"	*/
 
 
+/*
+ * 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/Yukon8220.h b/include/configs/Yukon8220.h
index 07fab44314d77f93d30f33045e15067d54d6d538..00c4ff093a6ce78f995e673d3a15291598894d19 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.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/ZPC1900.h b/include/configs/ZPC1900.h
index fb5bc0fdb3b569554c659ecd0b9c6a54604c57cf..7c1a5b9e88f626a0a7cf6cec321ad47bc7c49c8b 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -107,6 +107,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.
  */