diff --git a/include/configs/adsvix.h b/include/configs/adsvix.h
index 0d64013b2127081cda7f654bcb97f6b8a367070f..703d3124e6fbebf1d14452f009e3bbe7a7c425f5 100644
--- a/include/configs/adsvix.h
+++ b/include/configs/adsvix.h
@@ -69,6 +69,15 @@
 #define CONFIG_DOS_PARTITION   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/aev.h b/include/configs/aev.h
index 93b20db5cea84667c031745cb584b324f1050202..5bab793e9cc494a939ae56223cfbb0f870a8d0e4 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -91,6 +91,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -343,8 +352,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/alpr.h b/include/configs/alpr.h
index 27f2831b525ec1050f878fe9badbe9c35afb373a..d88c3ad43b0ec63d3d6a2debb7badd0e7efb0ab5 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -211,6 +211,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/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index db57dc11f12e5f89e5b3133905e52f75d0d1dd71..ecfa21d828028e9efb904d449628c07ba6478afa 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -98,6 +98,15 @@
 /* #define CONFIG_ENV_OVERWRITE	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/bamboo.h b/include/configs/bamboo.h
index c1fdaf8d5702e7adbd5edf50e82168de93bd4142..19b29aaf36c2d967e84fab3955f49633ded459c8 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -317,6 +317,15 @@
 #endif /*CONFIG_440EP*/
 
 
+/*
+ * 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/barco.h b/include/configs/barco.h
index 09078d42c622cb530cc26f99a7a7c442d327077f..0bb446f78447ea442d84ee57b60b0fb1507d32bc 100644
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -92,6 +92,8 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_PCI
 
+#undef CONFIG_CMD_NET
+
 
 #define CONFIG_HUSH_PARSER	1 /* use "hush" command parser */
 #define CONFIG_BOOTDELAY 	1
@@ -116,7 +118,6 @@
  */
 #define CONFIG_PCI				/* include pci support		*/
 #undef CONFIG_PCI_PNP
-#undef CFG_CMD_NET
 
 #define PCI_ENET0_IOADDR	0x80000000
 #define PCI_ENET0_MEMADDR	0x80000000
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 16892590e007d56d471fbda01fe898feb12c3ede..7736a1e32d0668a986dd7729689d8448d892dc6c 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -138,6 +138,15 @@
 #define CONFIG_RTC_DS174x	1	/* use DS1743 RTC in Bubinga	*/
 
 
+/*
+ * 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/canmb.h b/include/configs/canmb.h
index 9bb5b8304712d42f681a3e0d4a54c23656b471eb..d577b95e05decba247d0b5867922e981c000b07d 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -48,6 +48,15 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
+/*
+ * 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/cerf250.h b/include/configs/cerf250.h
index 0240ef2194a9e2a791a4cd127fd528c6983f3e3b..e06735da631faa33411e86b57090b23518d442c6 100644
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -62,6 +62,15 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
+/*
+ * 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/cm4008.h b/include/configs/cm4008.h
index d0ac46b3cafaf28b2c7850386d8a779237a587a6..ae40b358e951e06c80c5c69069a26a409ff7b73f 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -59,6 +59,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/cm41xx.h b/include/configs/cm41xx.h
index b62e3611736a11e5bff0d515a392976c4bde793c..c1dd33d1d25bb431e002430f1aa45cfc729205f3 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -59,6 +59,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/cmc_pu2.h b/include/configs/cmc_pu2.h
index 9e70900cb70e989651186829c4d3aaa8f0270738..f32c8c2c66bf421c97f92accbda50d2fea9db6f0 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -113,6 +113,15 @@
 #define CONFIG_BOOTDELAY      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/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index dbc41e97fbfd3fbe6dc3ffbc05062ee6def5471f..cd92af235223a4a2e8d12d88cfcde6d0804417fe 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -45,6 +45,15 @@
 #define CONFIG_BAUDRATE		57600
 
 
+/*
+ * 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/cobra5272.h b/include/configs/cobra5272.h
index 4ab60cf2717aee11b3bd271992d78eaade585bdd..510524ad36a12ffdf99d5a50cdc5c7209d540c18 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -131,6 +131,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/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 63150902c8773fc69f20cae821dc27a8d8c42ae5..84d50c71dd5f6f10ad65859cf445252fc5a85ac9 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -88,6 +88,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/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index c246ff5e648dcda633048dc24678b588b3d935c0..ce38af1dd851f8d4ee27810c04cc840d2dd8a112 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -59,6 +59,15 @@
 #define CFG_I2C_SLAVE		0x7F
 
 
+/*
+ * 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/cpci5200.h b/include/configs/cpci5200.h
index c4ed19abdd131dc4233708c7fbaf3f79dbe11be4..ce4ea1f8dbe9fb0469258223aa58d5b310b19dc0 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -99,6 +99,15 @@
 #define CONFIG_USB_STORAGE
 #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/cradle.h b/include/configs/cradle.h
index 5d6419fe1f2e73766c558e7626bd548eef352e15..eb93a8f083f7e4ab2f2039de445c90d4817013fb 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -62,6 +62,15 @@
 #define CONFIG_BAUDRATE         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/csb226.h b/include/configs/csb226.h
index 04bdf867b1796225a7e8aa6f282dfaf2510c5d4a..0be0f2192481a30693ee6d0ab093afc0288d2224 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -58,6 +58,15 @@
 #undef  CONFIG_MISC_INIT_R		/* not used yet                     */
 
 
+/*
+ * 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/csb637.h b/include/configs/csb637.h
index ac2fe54409d5a44bcfe150536bf2dffa9705a04f..976dae39f6966aab8dd9483a28610c4c04f27ca7 100644
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -100,6 +100,15 @@
 /* #define CONFIG_ENV_OVERWRITE	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/dbau1x00.h b/include/configs/dbau1x00.h
index c0f5a0990015bc03c4b81cabcd823e9e9c75e179..b2f606f498b794042ce474afd282ac373b9448d6 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -80,6 +80,15 @@
 #endif /* CONFIG_DBAU1550 */
 
 
+/*
+ * 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/debris.h b/include/configs/debris.h
index 96c76483aaf39d34458714ebec44a1281dbd12bb..7667e5e60e3c184f5f7db8290bdae7a0b3bbeb69 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -123,6 +123,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/delta.h b/include/configs/delta.h
index 7df72800f5862a0e3045ccf1f317621bd6e84c00..dbfe7a702b54bc61b75da1375efa33be048c571b 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -88,6 +88,15 @@
 #define CONFIG_BAUDRATE		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/dnp1110.h b/include/configs/dnp1110.h
index e58a2f219c8fb2c1680b45506a83ad2d057d0e82..d32e04602348db28cfdaa71d7298515138b45ff5 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -67,6 +67,15 @@
 #define CONFIG_BAUDRATE		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/eXalion.h b/include/configs/eXalion.h
index ac1ef959a7074d03876d3f8fdf0b65099770ecb5..f8e2c885b064d6112dad78fb080fc19de68c9881 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -58,6 +58,15 @@
 
 						    /*#define CONFIG_DRAM_SPEED	      66   */ /* 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/ebony.h b/include/configs/ebony.h
index d86a9efbefd84070c9ac5858cb8af0b39d37d330..2c626a0328881cfd9d611ea01101f36d246fa391 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -209,6 +209,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/ep8248.h b/include/configs/ep8248.h
index 8653b55affe894807b1b5250f7da38ea26e7ba35..85ad70a0d5083ddccb2d54a94873eaf70497de25 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -124,6 +124,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.
  */
@@ -192,13 +201,13 @@
 #define CFG_JFFS2_LAST_SECTOR   62
 #define CFG_JFFS2_SORT_FRAGMENTS
 #define CFG_JFFS_CUSTOM_PART
-#endif /* CFG_CMD_JFFS2 */
+#endif
 
 #if defined(CONFIG_CMD_I2C)
 #define CONFIG_HARD_I2C		1	/* To enable I2C support	*/
 #define CFG_I2C_SPEED		100000	/* I2C speed			*/
 #define CFG_I2C_SLAVE		0x7F	/* I2C slave address		*/
-#endif /* CFG_CMD_I2C */
+#endif
 
 #define CFG_MONITOR_BASE	TEXT_BASE
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 25f9bd6a718eac52c12aff7f75819d2ce4730058..f412ec8ed80e3fcdd70c99efd2e9e7129258f523 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -291,6 +291,15 @@
 #define CFG_PROMPT_HUSH_PS2	"> "
 
 
+/*
+ * 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/ep82xxm.h b/include/configs/ep82xxm.h
index 430ff4b8f48bb9e6a064c4bed0b2018037bca567..4febd322a4f0e848a073b97ebec3fa3dfcf6cbc9 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -109,6 +109,15 @@
 #define CFG_VXWORKS_MAC_PTR 0x4300 /* Pass Ethernet MAC to VxWorks */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -318,13 +327,13 @@
 #define CFG_JFFS2_LAST_SECTOR   62
 #define CFG_JFFS2_SORT_FRAGMENTS
 #define CFG_JFFS_CUSTOM_PART
-#endif /* CFG_CMD_JFFS2 */
+#endif
 
 #if defined(CONFIG_CMD_I2C)
 #define CONFIG_HARD_I2C		1	/* To enable I2C support	*/
 #define CFG_I2C_SPEED		100000	/* I2C speed			*/
 #define CFG_I2C_SLAVE		0x7F	/* I2C slave address		*/
-#endif /* CFG_CMD_I2C */
+#endif
 
 #define CFG_MONITOR_BASE	TEXT_BASE
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)