From 659e2f6736232a08acca8785c206e2b4d9cd07d7 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 09:10:49 -0500
Subject: [PATCH] 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>
---
include/configs/JSE.h | 9 +++++++++
include/configs/KAREF.h | 9 +++++++++
include/configs/M5271EVB.h | 9 +++++++++
include/configs/M5272C3.h | 9 +++++++++
include/configs/M5282EVB.h | 9 +++++++++
include/configs/MBX.h | 9 +++++++++
include/configs/METROBOX.h | 9 +++++++++
include/configs/MIP405.h | 9 +++++++++
include/configs/ML2.h | 9 +++++++++
include/configs/MOUSSE.h | 9 +++++++++
include/configs/MPC8260ADS.h | 9 +++++++++
include/configs/MPC8349EMDS.h | 9 +++++++++
include/configs/MPC8349ITX.h | 11 ++++++++++-
include/configs/MPC8360EMDS.h | 9 +++++++++
include/configs/MPC8540ADS.h | 9 +++++++++
include/configs/MPC8540EVAL.h | 9 +++++++++
include/configs/MPC8541CDS.h | 9 +++++++++
include/configs/MPC8544DS.h | 9 +++++++++
include/configs/MPC8548CDS.h | 9 +++++++++
include/configs/MPC8555CDS.h | 9 +++++++++
include/configs/MPC8560ADS.h | 9 +++++++++
include/configs/MPC8641HPCN.h | 9 +++++++++
include/configs/MUSENKI.h | 9 +++++++++
include/configs/OCRTC.h | 9 +++++++++
include/configs/ORSG.h | 9 +++++++++
include/configs/OXC.h | 9 +++++++++
26 files changed, 235 insertions(+), 1 deletion(-)
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index c67c063e8b..ea3b0b4a32 100644
--- 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 f0368049d1..3644e43885 100644
--- 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 1907a3c439..885a8821bf 100644
--- 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 417166524f..cc456dc08a 100644
--- 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 cf3076efc5..f2a7644930 100644
--- 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 ae8913ca86..d9f2addb56 100644
--- 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 e9aaedb818..8d7ec5926b 100644
--- 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 192998e795..5b526a0993 100644
--- 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 8d61d4861e..f488275f23 100644
--- 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 518bf1213e..9370c24c50 100644
--- 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 a36b69d6bb..f3e5330c77 100644
--- 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 9855a62a7f..1567fcfae3 100644
--- 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 799ff4a7ab..121ff06dc5 100644
--- 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 b355f89bf8..4b32a140e8 100644
--- 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 f103e47925..7b010bfb59 100644
--- 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 dea061abee..0ce25cf24e 100644
--- 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 5f12eeecc5..50d3b6b872 100644
--- 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 b33d2255b3..d0f94a3e22 100644
--- 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 cef92d2540..2e84fc8748 100644
--- 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 077aaa3771..a3025bd715 100644
--- 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 affe535e71..8ce8a53752 100644
--- 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 0579a35f89..808c19f767 100644
--- 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 d6dafb2c8e..f8cf01e5d3 100644
--- 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 00f747ef43..5840ea25f4 100644
--- 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 bab4c3d37d..937df229f1 100644
--- 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 e70d4850a9..8d61bcd2d4 100644
--- 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.
*/
--
GitLab