include/configs/[J-O]*: 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>

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index c67c063e8bfa3ba31e283cce1bb38f48e0e48777..ea3b0b4a3256020ecf226501709fe2602c59edb4 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -136,6 +136,15 @@
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 
 
+/*
+ * 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/KAREF.h b/include/configs/KAREF.h
index f0368049d1d7434874abe37a2643c2c4011bacff..3644e43885e70f8b6792fd5ddcff4d681b6caf50 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -178,6 +178,15 @@
 #define CFG_RX_ETH_BUFFER     32            /* #eth rx buff & descrs   */
 
 
+/*
+ * 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/M5271EVB.h b/include/configs/M5271EVB.h
index 1907a3c4396c287749c3026dd2317ed25d85411b..885a8821bf9e7c68c1237097743c47b338e9f41a 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -65,6 +65,15 @@
 #define CFG_ENV_IS_IN_FLASH    1
 #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/M5272C3.h b/include/configs/M5272C3.h
index 417166524f6c2e2aac35ba3a5fca722d64fa1e6d..cc456dc08a9c9ab886b7211ceac6c3bbe4c0e7e9 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -61,6 +61,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/M5282EVB.h b/include/configs/M5282EVB.h
index cf3076efc59fb071113098502b6bc86dc57ed011..f2a7644930f37e0aecb6001a657332d51ad1b124 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -51,6 +51,15 @@
 #define CFG_ENV_IS_IN_FLASH    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/MBX.h b/include/configs/MBX.h
index ae8913ca86a99dd918a2ebf8982b7d2bd0721058..d9f2addb56599a60169670f69acea3542986e63c 100644 (file)
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -72,6 +72,15 @@
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
 
+/*
+ * 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/METROBOX.h b/include/configs/METROBOX.h
index e9aaedb8181d061eccbe5b894aa4cdbf64c86d8d..8d7ec5926bc7267815678d930b3449be61f6c2e3 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -242,6 +242,15 @@
 #define CFG_RX_ETH_BUFFER     32            /* #eth rx buff & descrs   */
 
 
+/*
+ * 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/MIP405.h b/include/configs/MIP405.h
index 192998e7956a8223d4586a620f6237070220681c..5b526a0993f84a2f8918c49c9a340461702c4aa7 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -51,6 +51,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/ML2.h b/include/configs/ML2.h
index 8d61d4861e71346a1c7970f6c768299cf7d6a080..f488275f239d7911b9475680b259567e5f49ff3f 100644 (file)
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -76,6 +76,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/MOUSSE.h b/include/configs/MOUSSE.h
index 518bf1213ee5fc8f975bfa22c94ca3d4e8780468..9370c24c500ec7040e05c3b72be387f792431776 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -60,6 +60,15 @@
 #define CONFIG_BOOTDELAY     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/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index a36b69d6bbd4cda99ede47c3927423e4b0372b49..f3e5330c7796a8b541d09ba837b801ffe86bb25c 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -197,6 +197,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/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 9855a62a7fe23d3d07ee357887ccbb3538012783..1567fcfae32cfca9a1248d38d38fe95ee139611f 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -476,6 +476,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/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 799ff4a7ab0039b35e25dce48979cceb50608c7f..121ff06dc5cecb4c7a474ffe11b2fc32dbdf96eb 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -372,7 +372,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #define CONFIG_NET_MULTI
 #define CONFIG_MII
-#define CONFIG_PHY_GIGE                /* In case CFG_CMD_MII is specified */
+#define CONFIG_PHY_GIGE                /* In case CONFIG_CMD_MII is specified */
 
 #define CONFIG_TSEC1
 
@@ -416,6 +416,15 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_LOADS_ECHO      /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  /* 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/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index b355f89bf8bf07077c20c8c1526a08cb0b8a1e0e..4b32a140e8182305a066f69560e6f20597cebbe8 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -457,6 +457,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/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index f103e47925e7a8d1eac199730d86158d4f628a91..7b010bfb595033a7bf9171e14d2c7cf2621549ed 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -408,6 +408,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/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index dea061abee9d007a764a1071326840257534e845..0ce25cf24e74f7ffec61e3ca2e1503d0dc6ad1ac 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -260,6 +260,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/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 5f12eeecc518e7d7eef4465baeffadf68992688f..50d3b6b8727eda2eea0cf5dce2e0d99945d48670 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -401,6 +401,15 @@ extern unsigned long get_clock_freq(void);
 #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/MPC8544DS.h b/include/configs/MPC8544DS.h
index b33d2255b39a38d30881458cb630e2d812367620..d0f94a3e22098cb9b0ad5b160b2fe344cc4bf96e 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -393,6 +393,15 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #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/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index cef92d2540d7b1d8d549d18a402dc28a57365021..2e84fc8748d5e760171d1aa38b247871b273bcf6 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -427,6 +427,15 @@ extern unsigned long get_clock_freq(void);
 #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/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 077aaa377130f0ff21f2b6eec28d30186d9fbe72..a3025bd715768bb73529b93c784365a8c6373c22 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -401,6 +401,15 @@ extern unsigned long get_clock_freq(void);
 #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/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index affe535e717c5803a3433de735d579482fa2483a..8ce8a537526952516b1f52f82a7d377fdd18df56 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -432,6 +432,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/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 0579a35f8962cb98abe0f1f4fb4f291aebe57b7d..808c19f767326a5f432a89dfa16afbc9325dde74 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -476,6 +476,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/MUSENKI.h b/include/configs/MUSENKI.h
index d6dafb2c8e22b30bfd048f020923cd7decf76aa0..f8cf01e5d3eb13bc3f1b42fd5193461afca66415 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -53,6 +53,15 @@
 #define CONFIG_BOOTDELAY       5
 
 
+/*
+ * 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/OCRTC.h b/include/configs/OCRTC.h
index 00f747ef431c9f1dec306c556afc4b79082fe60f..5840ea25f4bf42aebc0f659030f3cc9db43a396a 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -55,6 +55,15 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 
 
+/*
+ * 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/ORSG.h b/include/configs/ORSG.h
index bab4c3d37d3e72939d375bfa4d9f52429a9ea9d6..937df229f1609b29a83f292087b945f3eee4bd87 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -55,6 +55,15 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 
 
+/*
+ * 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/OXC.h b/include/configs/OXC.h
index e70d4850a9ffad414cbff348dd9bfdd87c79d293..8d61bcd2d419eed84c495994982c03bea8cba9fc 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -52,6 +52,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.
  */