From 079a136c3588814784561d6e4856970ee82d6e2a Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 10:12:10 -0500
Subject: [PATCH] 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>
---
 board/fads/fads.h              | 10 ++++++++++
 include/configs/MPC8313ERDB.h  |  9 +++++++++
 include/configs/MPC832XEMDS.h  |  9 +++++++++
 include/configs/MPC8568MDS.h   |  9 +++++++++
 include/configs/acadia.h       |  9 +++++++++
 include/configs/bf533-ezkit.h  |  9 +++++++++
 include/configs/bf533-stamp.h  |  9 +++++++++
 include/configs/bf537-stamp.h  |  9 +++++++++
 include/configs/bf561-ezkit.h  |  9 +++++++++
 include/configs/integratorap.h |  9 +++++++++
 include/configs/integratorcp.h |  9 +++++++++
 include/configs/katmai.h       |  9 +++++++++
 include/configs/lwmon5.h       |  9 +++++++++
 include/configs/ml401.h        |  9 +++++++++
 include/configs/motionpro.h    |  9 +++++++++
 include/configs/p3p440.h       |  9 +++++++++
 include/configs/pb1x00.h       |  9 +++++++++
 include/configs/pcs440ep.h     |  9 +++++++++
 include/configs/pdnb3.h        |  9 +++++++++
 include/configs/pf5200.h       | 24 +++++++++++++-----------
 include/configs/pleb2.h        |  9 +++++++++
 include/configs/ppmc7xx.h      |  9 +++++++++
 include/configs/purple.h       |  9 +++++++++
 include/configs/pxa255_idp.h   |  9 +++++++++
 include/configs/r5200.h        |  9 +++++++++
 include/configs/rsdproto.h     |  9 +++++++++
 include/configs/sbc2410x.h     |  9 +++++++++
 include/configs/sbc8349.h      |  9 +++++++++
 include/configs/sbc8560.h      |  9 +++++++++
 include/configs/sc3.h          |  9 +++++++++
 include/configs/sc520_cdp.h    |  9 +++++++++
 include/configs/sc520_spunk.h  |  9 +++++++++
 include/configs/scb9328.h      | 11 ++++++++++-
 include/configs/sequoia.h      |  9 +++++++++
 include/configs/shannon.h      |  9 +++++++++
 include/configs/smdk2400.h     |  9 +++++++++
 include/configs/smdk2410.h     |  9 +++++++++
 include/configs/smmaco4.h      | 12 ++++++++++--
 include/configs/sorcery.h      |  9 +++++++++
 include/configs/spc1920.h      | 11 ++++++++++-
 include/configs/spieval.h      | 12 ++++++++++--
 include/configs/stxgp3.h       |  9 +++++++++
 include/configs/stxssa.h       |  9 +++++++++
 include/configs/suzaku.h       |  9 +++++++++
 include/configs/taishan.h      |  9 +++++++++
 include/configs/tb0229.h       |  9 +++++++++
 include/configs/trab.h         |  9 +++++++++
 include/configs/uc101.h        | 12 ++++++++++--
 include/configs/utx8245.h      |  9 +++++++++
 include/configs/v38b.h         |  9 +++++++++
 include/configs/walnut.h       |  9 +++++++++
 include/configs/wepep250.h     | 11 ++++++++++-
 include/configs/xaeniax.h      |  9 +++++++++
 include/configs/xm250.h        |  9 +++++++++
 include/configs/xsengine.h     |  9 +++++++++
 include/configs/xupv2p.h       |  9 +++++++++
 include/configs/yosemite.h     |  9 +++++++++
 include/configs/yucca.h        |  9 +++++++++
 include/configs/zylonite.h     |  9 +++++++++
 59 files changed, 542 insertions(+), 20 deletions(-)

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 8558b7426b..75237818ce 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -95,6 +95,16 @@
 #define CFG_DISCOVER_PHY
 #endif
 
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 #if !defined(FADS_COMMANDS_ALREADY_DEFINED)
 /*
  * Command line configuration.
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3334f0fe99..45a7d81792 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -341,6 +341,15 @@
 #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/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 1984157e1c..f62ca2c42b 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -423,6 +423,15 @@
 #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/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 41b1ae1206..eef168c252 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -384,6 +384,15 @@ extern unsigned long get_clock_freq(void);
 #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/acadia.h b/include/configs/acadia.h
index 5bd8ac63e1..e3f6e2c8b3 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -299,6 +299,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.
  */
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 487ca6a189..6cb6bc4f71 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -97,6 +97,15 @@
 #define CONFIG_LOADS_ECHO	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/bf533-stamp.h b/include/configs/bf533-stamp.h
index f93c61e4b7..cce6ef79f2 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -289,6 +289,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/bf537-stamp.h b/include/configs/bf537-stamp.h
index bea157a45f..b9a9e3cb79 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -163,6 +163,15 @@
 #define CONFIG_NETCONSOLE	1
 #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.
  */
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 40f5abc743..29662604f9 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -187,6 +187,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/integratorap.h b/include/configs/integratorap.h
index be3b1140bb..1452bf2c46 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -69,6 +69,15 @@
 /*#define CONFIG_NET_MULTI */
 
 
+/*
+ * 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 191c5e61e3..69310d4dfb 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -71,6 +71,15 @@
 #define CFG_SERIAL1		0x17000000
 
 
+/*
+ * 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/katmai.h b/include/configs/katmai.h
index 9258e7dd80..110ad44ee1 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -211,6 +211,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/lwmon5.h b/include/configs/lwmon5.h
index 13cbed5e9a..f24dac4170 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -224,6 +224,15 @@
 #define CONFIG_ISO_PARTITION
 
 
+/*
+ * 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/ml401.h b/include/configs/ml401.h
index 6cfc9478a2..7eeae708a7 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -145,6 +145,15 @@
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
 #endif /* !FLASH */
 
+/*
+ * 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/motionpro.h b/include/configs/motionpro.h
index 7a61e49395..e0a827fdd7 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -36,6 +36,15 @@
 #define CONFIG_MOTIONPRO	1	/* ... on Promess Motion-PRO board */
 
 
+/*
+ * 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/p3p440.h b/include/configs/p3p440.h
index 2a429614aa..51f19a1456 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -169,6 +169,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/pb1x00.h b/include/configs/pb1x00.h
index c84795b6ab..810e0f0462 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -177,6 +177,15 @@
 #define CFG_CACHELINE_SIZE	32
 
 
+/*
+ * 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/pcs440ep.h b/include/configs/pcs440ep.h
index f0cd8d3c02..aa66c30f0e 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -209,6 +209,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/pdnb3.h b/include/configs/pdnb3.h
index 5d6e169c26..5b5b0efb76 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -72,6 +72,15 @@
 #define CFG_IXP425_CONSOLE	IXP425_UART1   /* we use UART1 for console */
 
 
+/*
+ * 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/pf5200.h b/include/configs/pf5200.h
index 3e72c652bc..18d0c879a9 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 f581fe5e23..863029d146 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.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/ppmc7xx.h b/include/configs/ppmc7xx.h
index 6a3bd33d2e..6e451d8b6c 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -68,6 +68,15 @@
  * CMD_PCI		- PCI Bus scanning command
  */
 
+/*
+ * 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/purple.h b/include/configs/purple.h
index 61e18d7b71..6eb618ed6d 100644
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -82,6 +82,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/pxa255_idp.h b/include/configs/pxa255_idp.h
index d7e4e8ac2b..0e884fc114 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -103,6 +103,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/r5200.h b/include/configs/r5200.h
index 0592939001..0e743bb2e4 100644
--- a/include/configs/r5200.h
+++ b/include/configs/r5200.h
@@ -67,6 +67,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/rsdproto.h b/include/configs/rsdproto.h
index 93f5c6be8d..814082ccc6 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -102,6 +102,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/sbc2410x.h b/include/configs/sbc2410x.h
index fe06be674c..b4a063a1d4 100644
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -83,6 +83,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/sbc8349.h b/include/configs/sbc8349.h
index 81322dfc70..83a81fec13 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -440,6 +440,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/sbc8560.h b/include/configs/sbc8560.h
index ad610f031a..defc428819 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -321,6 +321,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/sc3.h b/include/configs/sc3.h
index 9709fe292c..cb22536987 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -168,6 +168,15 @@
 #define CONFIG_MII 1			/* add 405GP MII PHY management		*/
 #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.
  */
diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index 8689be4df3..8491d97ae4 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -66,6 +66,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/sc520_spunk.h b/include/configs/sc520_spunk.h
index e761ca7b55..c6f7f1526c 100644
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -65,6 +65,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/scb9328.h b/include/configs/scb9328.h
index 489c35ff4b..d140241bff 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -35,6 +35,15 @@
  */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 14a64e8c3f..ec6e9bd6b3 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -307,6 +307,15 @@
 #define CONFIG_ISO_PARTITION
 
 
+/*
+ * 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/shannon.h b/include/configs/shannon.h
index cad38d0c00..c1fa53f1a8 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.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/smdk2400.h b/include/configs/smdk2400.h
index 22e69725b3..05f6053727 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -87,6 +87,15 @@
 #define CONFIG_RTC_S3C24X0	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/smdk2410.h b/include/configs/smdk2410.h
index cd3d327654..ca404ff452 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -73,6 +73,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/smmaco4.h b/include/configs/smmaco4.h
index a965e8ac8e..ad68c751c8 100644
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -65,6 +65,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 e8f4cfac3f..fe014eabcb 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -64,6 +64,15 @@
 #define CONFIG_PCI_CFG_SIZE	0x01000000
 
 
+/*
+ * 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/spc1920.h b/include/configs/spc1920.h
index ea6a11237d..b4ab9ad972 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -81,6 +81,15 @@
 #define CONFIG_BZIP2	 /* include support for bzip2 compressed images */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 ccfcf1c8dc..4b618f36a8 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -121,6 +121,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 9c55844dfe..1f41cf7699 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -298,6 +298,15 @@
 #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/stxssa.h b/include/configs/stxssa.h
index f480bd530f..a880931cb1 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -326,6 +326,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/suzaku.h b/include/configs/suzaku.h
index cb1a2e6a1a..08ac9cbd58 100644
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -56,6 +56,15 @@
 #define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0)
 
 
+/*
+ * 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/taishan.h b/include/configs/taishan.h
index 4889f7026b..baa4fbd312 100644
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -235,6 +235,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/tb0229.h b/include/configs/tb0229.h
index df031753d6..a21af219a7 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -88,6 +88,15 @@
 #define CONFIG_BOOTCOMMAND	"run netboot"
 
 
+/*
+ * 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/trab.h b/include/configs/trab.h
index a696b634a9..52bcbfc158 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -131,6 +131,15 @@
 #define CONFIG_RTC_S3C24X0	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/uc101.h b/include/configs/uc101.h
index 64461f6a90..3b471d0a97 100644
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -51,6 +51,15 @@
 #define CONFIG_DOS_PARTITION
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 f399543144..cd00c49fc2 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -87,6 +87,15 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 #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/v38b.h b/include/configs/v38b.h
index 3e3d11674e..c0b1a15e6b 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -85,6 +85,15 @@
 #define CONFIG_USB_CONFIG	0x00001000
 
 
+/*
+ * 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/walnut.h b/include/configs/walnut.h
index 2112b53179..180549efad 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -99,6 +99,15 @@
 #define CONFIG_RTC_DS174x	1	/* use DS1743 RTC in Walnut	*/
 
 
+/*
+ * 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/wepep250.h b/include/configs/wepep250.h
index 3b360402de..c67b301227 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -35,6 +35,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.
  */
@@ -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 1149542bbe..7418986caa 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -65,6 +65,15 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
 
 
+/*
+ * 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/xm250.h b/include/configs/xm250.h
index 225d46a38a..bcd16ec5da 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -82,6 +82,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/xsengine.h b/include/configs/xsengine.h
index 37daefe87e..5733933d61 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -103,6 +103,15 @@
 /* allow to overwrite serial and ethaddr */
 #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/xupv2p.h b/include/configs/xupv2p.h
index cfa1281135..35001d7ada 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -120,6 +120,15 @@
 #define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
 
+/*
+ * 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/yosemite.h b/include/configs/yosemite.h
index 853e4bcc0d..dd6d9acdd5 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -249,6 +249,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/yucca.h b/include/configs/yucca.h
index ab323aaab4..9c536fd12d 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -192,6 +192,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/zylonite.h b/include/configs/zylonite.h
index 3e636a27d2..517ecb13b7 100644
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -77,6 +77,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.
  */
-- 
2.39.5