include/configs/[p-z]* + misc: 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>

58 files changed, 532 insertions, 20 deletions

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3334f0fe99a..45a7d81792d 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -342,6 +342,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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 1984157e1cf..f62ca2c42be 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -424,6 +424,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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 41b1ae1206c..eef168c252d 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -385,6 +385,15 @@ extern unsigned long get_clock_freq(void);
 
 
 /*
+ * 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/acadia.h b/include/configs/acadia.h
index 5bd8ac63e1d..e3f6e2c8b34 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -300,6 +300,15 @@
 #define CONFIG_SUPPORT_VFAT
 
 /*
+ * 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/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 487ca6a1897..6cb6bc4f71c 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.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/bf533-stamp.h b/include/configs/bf533-stamp.h
index f93c61e4b7b..cce6ef79f27 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -290,6 +290,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/bf537-stamp.h b/include/configs/bf537-stamp.h
index bea157a45f6..b9a9e3cb792 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -164,6 +164,15 @@
 #define CONFIG_NET_MULTI	1
 
 /*
+ * 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/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 40f5abc7438..29662604f99 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -188,6 +188,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/integratorap.h b/include/configs/integratorap.h
index be3b1140bb1..1452bf2c467 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.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.
  */
 
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 191c5e61e32..69310d4dfbc 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -72,6 +72,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/katmai.h b/include/configs/katmai.h
index 9258e7dd809..110ad44ee1b 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -212,6 +212,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/lwmon5.h b/include/configs/lwmon5.h
index 13cbed5e9a5..f24dac41704 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -225,6 +225,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/ml401.h b/include/configs/ml401.h
index 6cfc9478a24..7eeae708a72 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -146,6 +146,15 @@
 #endif /* !FLASH */
 
 /*
+ * 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/motionpro.h b/include/configs/motionpro.h
index 7a61e493956..e0a827fdd71 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -37,6 +37,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/p3p440.h b/include/configs/p3p440.h
index 2a429614aaf..51f19a1456c 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -170,6 +170,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/pb1x00.h b/include/configs/pb1x00.h
index c84795b6ab0..810e0f04628 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -178,6 +178,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/pcs440ep.h b/include/configs/pcs440ep.h
index f0cd8d3c02f..aa66c30f0ea 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -210,6 +210,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/pdnb3.h b/include/configs/pdnb3.h
index 5d6e169c26a..5b5b0efb76a 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.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/pf5200.h b/include/configs/pf5200.h
index 3e72c652bc7..18d0c879a9e 100644
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -85,13 +85,6 @@
 #define CFG_RX_ETH_BUFFER	8	/* use 8 rx buffer on eepro100	*/
 #define CONFIG_NS8382X		1
 #endif
-
-#define ADD_PCI_CMD		CFG_CMD_PCI
-
-#else				/* MPC5100 */
-
-#define ADD_PCI_CMD		0	/* no CFG_CMD_PCI */
-
 #endif
 
 /* Partitions */
@@ -101,26 +94,35 @@
 /* USB */
 #if 0
 #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
 
 
 /*
+ * 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>
 
 #define CONFIG_CMD_BSP
-#define CONFIG_PCI_CMD
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 
+#ifdef CONFIG_MPC5200
+#define CONFIG_CMD_PCI
+#endif
+
 
 #if (TEXT_BASE == 0xFF000000)	/* Boot low with 16 MB Flash */
 #   define CFG_LOWBOOT		1
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index f581fe5e23f..863029d146d 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -68,6 +68,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/ppmc7xx.h b/include/configs/ppmc7xx.h
index 6a3bd33d2e9..6e451d8b6cb 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.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/purple.h b/include/configs/purple.h
index 61e18d7b715..6eb618ed6d3 100644
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -83,6 +83,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/pxa255_idp.h b/include/configs/pxa255_idp.h
index d7e4e8ac2b1..0e884fc114c 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -104,6 +104,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/r5200.h b/include/configs/r5200.h
index 05929390010..0e743bb2e48 100644
--- a/include/configs/r5200.h
+++ b/include/configs/r5200.h
@@ -68,6 +68,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/rsdproto.h b/include/configs/rsdproto.h
index 93f5c6be8d8..814082ccc63 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -103,6 +103,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/sbc2410x.h b/include/configs/sbc2410x.h
index fe06be674cd..b4a063a1d4c 100644
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.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/sbc8349.h b/include/configs/sbc8349.h
index 81322dfc70c..83a81fec139 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -441,6 +441,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/sbc8560.h b/include/configs/sbc8560.h
index ad610f031a6..defc428819b 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -322,6 +322,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/sc3.h b/include/configs/sc3.h
index 9709fe292c2..cb225369871 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -169,6 +169,15 @@
 #define CONFIG_PHY_ADDR 1	/* the connected Phy defaults to address 1 */
 
 /*
+ * 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/sc520_cdp.h b/include/configs/sc520_cdp.h
index 8689be4df3f..8491d97ae42 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -67,6 +67,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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index e761ca7b55b..c6f7f1526c6 100644
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.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/scb9328.h b/include/configs/scb9328.h
index 489c35ff4b4..d140241bff4 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -36,6 +36,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>
@@ -180,7 +189,7 @@
  * Right now there is no gain for user, but later on booting kernel might be
  * possible. Consider using XIP kernel running from flash to save RAM
  * footprint.
- * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
+ * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
  */
 #define CFG_JFFS2_FIRST_BANK		0
 #define CFG_JFFS2_FIRST_SECTOR		5
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 14a64e8c3fc..ec6e9bd6b31 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.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/shannon.h b/include/configs/shannon.h
index cad38d0c00d..c1fa53f1a8a 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -68,6 +68,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/smdk2400.h b/include/configs/smdk2400.h
index 22e69725b37..05f60537270 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.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>
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index cd3d3276547..ca404ff452a 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -74,6 +74,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/smmaco4.h b/include/configs/smmaco4.h
index a965e8ac8ee..ad68c751c89 100644
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.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>
@@ -338,8 +347,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/sorcery.h b/include/configs/sorcery.h
index e8f4cfac3ff..fe014eabcbc 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.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/spc1920.h b/include/configs/spc1920.h
index ea6a11237d2..b4ab9ad9726 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.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>
@@ -194,7 +203,7 @@
 #define CFG_CACHELINE_SIZE	16	/* For all MPC8xx CPUs			*/
 #define CFG_CACHELINE_SHIFT	4	/* log base 2 of the above value	*/
 
-#ifdef CFG_CMD_DATE
+#ifdef CONFIG_CMD_DATE
 # define CONFIG_RTC_DS3231
 # define CFG_I2C_RTC_ADDR      0x68
 #endif
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index ccfcf1c8dc0..4b618f36a87 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -122,6 +122,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>
@@ -419,8 +428,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/stxgp3.h b/include/configs/stxgp3.h
index 9c55844dfe8..1f41cf7699e 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -299,6 +299,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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index f480bd530f4..a880931cb1c 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -327,6 +327,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/suzaku.h b/include/configs/suzaku.h
index cb1a2e6a1a0..08ac9cbd58b 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.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/taishan.h b/include/configs/taishan.h
index 4889f7026b8..baa4fbd312b 100644
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -236,6 +236,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/tb0229.h b/include/configs/tb0229.h
index df031753d6a..a21af219a7e 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -89,6 +89,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/trab.h b/include/configs/trab.h
index a696b634a9a..52bcbfc158b 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -132,6 +132,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/uc101.h b/include/configs/uc101.h
index 64461f6a90e..3b471d0a97f 100644
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.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>
@@ -265,8 +274,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/utx8245.h b/include/configs/utx8245.h
index f3995431447..cd00c49fc22 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -88,6 +88,15 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 
 /*
+ * 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/v38b.h b/include/configs/v38b.h
index 3e3d11674ed..c0b1a15e6b2 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -86,6 +86,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/walnut.h b/include/configs/walnut.h
index 2112b531795..180549efad3 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.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/wepep250.h b/include/configs/wepep250.h
index 3b360402dec..c67b3012276 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -36,6 +36,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>
@@ -149,7 +158,7 @@
  * Right now there is no gain for user, but later on booting kernel might be
  * possible. Consider using XIP kernel running from flash to save RAM
  * footprint.
- * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
+ * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
  */
 #define CFG_JFFS2_FIRST_BANK		0
 #define CFG_JFFS2_FIRST_SECTOR		5
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1149542bbe2..7418986caac 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.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/xm250.h b/include/configs/xm250.h
index 225d46a38ae..bcd16ec5da0 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -83,6 +83,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/xsengine.h b/include/configs/xsengine.h
index 37daefe87ef..5733933d616 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -104,6 +104,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.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index cfa12811351..35001d7ada3 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.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/yosemite.h b/include/configs/yosemite.h
index 853e4bcc0dd..dd6d9acdd5d 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -250,6 +250,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/yucca.h b/include/configs/yucca.h
index ab323aaab43..9c536fd12da 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -193,6 +193,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/zylonite.h b/include/configs/zylonite.h
index 3e636a27d2d..517ecb13b7f 100644
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -78,6 +78,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>