include/configs/[A-I]*: 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/A3000.h b/include/configs/A3000.h
index eb0749076663136906159d16adedc4438ae06f45..0a9a1ff90c843e7de9c41fd62647a8e0ac963d64 100644 (file)
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.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/ADCIOP.h b/include/configs/ADCIOP.h
index f79fad18612020402a89bba6104f61a30b87e33c..46329918ef1cb4a9c20cb830bbb048a9a2e8a4b6 100644 (file)
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -59,6 +59,15 @@
 #define CONFIG_IPADDR          10.0.18.222
 #define CONFIG_SERVERIP                10.0.18.190
 
+
+/*
+ * 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/ADNPESC1.h b/include/configs/ADNPESC1.h
index 0635506e62809a2662bb0bed23404afe88a716ac..d4ee14c837f3b9cebe02ebd0b73f1288c2bcf807 100644 (file)
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -564,6 +564,15 @@
 #define        CFG_NIOS_POST_WORD_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 
 
+
+/*
+ * 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/AP1000.h b/include/configs/AP1000.h
index 015699dbdcf3909559ea24a3f0466073285ff7fd..d25aa74a4527df8019842e7d51d00a2c88baebad 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -67,6 +67,14 @@
 #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/APC405.h b/include/configs/APC405.h
index 5ac86bef8607639ac75df9554e83ef08dc964696..6dcfbc15d4c1c069a18fd7045dd2aea5fefe5ed4 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -68,6 +68,15 @@
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
 
 
+/*
+ * 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/AR405.h b/include/configs/AR405.h
index 785f94550511403a8284ed01e44b0d230a3e1b6d..0f301ec0c6af4d6419e5be09945b3913d2a29330 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -72,6 +72,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/ASH405.h b/include/configs/ASH405.h
index f0ec761ebb54f482b39af5038b66867dfef75319..9e0ee371c2ce23864e15ab3d0ace114341ff24e7 100644 (file)
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -60,6 +60,15 @@
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
 
 
+/*
+ * 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/Adder.h b/include/configs/Adder.h
index 9a429442fd9e0f6522616183fb959c0d211765f0..5e076dcc41ca5db1453660ae7c1c51c4122e3373 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -53,6 +53,15 @@
 #endif /* CONFIG_MPC852T */
 
 
+/*
+ * 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/Alaska8220.h b/include/configs/Alaska8220.h
index e47872d27eaac7c75b31a0283665881f715f581f..3f2f6140f634da7fda0895ae8136a7957bf1ff14 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -65,6 +65,15 @@
 #define CONFIG_TIMESTAMP                       /* Print image info with timestamp */
 
 
+/*
+ * 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/BC3450.h b/include/configs/BC3450.h
index aec4d83f25181320435db69b2c7c386900654eb6..844bdc5d883e0566eaf705fc4a43bc0fc6c75ace 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -143,6 +143,15 @@
 #endif /* CONFIG_POST */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -449,8 +458,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/BMW.h b/include/configs/BMW.h
index b062316a09bd5c4641d3fb55a817b7b6a7dcbb34..bb7856f675d91b75d0a71bf35fbfe790eb21d29a 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -66,6 +66,15 @@
 #define CFG_DOC_SHORT_TIMEOUT    1
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -76,7 +85,7 @@
 #define CONFIG_CMD_ELF
 
 
-/* CFG_CMD_DOC required legacy NAND support */
+/* CONFIG_CMD_DOC required legacy NAND support */
 #define CFG_NAND_LEGACY
 
 #if 0

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index 8e09c52764699d9f59b0bb56d3080059656fb27b..0e082b318bb4b7416e445725dcf045010cc9a1c2 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -57,6 +57,15 @@
 #define CONFIG_PHY_ADDR                0       /* 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/CATcenter.h b/include/configs/CATcenter.h
index 33c8b1c2d7b6f2896452fa172dccdbab8db492aa..62a2eaa23659e5d1c667c596f2f3466c78410456 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -120,6 +120,15 @@
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 
+/*
+ * 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/CPCI2DP.h b/include/configs/CPCI2DP.h
index def2646cc2089a95fac33787c5cfe7f60b2747e6..a3717b9052f5802006e8cd8e733738f7fe7f936a 100644 (file)
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -54,6 +54,15 @@
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* 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/CPCI440.h b/include/configs/CPCI440.h
index 73b3e8a6ebe203b8bb73fe8b93c86aad0cd49681..318ada1a4fba7f1c61a9f820f08346d81a09e741 100644 (file)
--- a/include/configs/CPCI440.h
+++ b/include/configs/CPCI440.h
@@ -173,6 +173,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/CPCIISER4.h b/include/configs/CPCIISER4.h
index e0b4d8c178e0b648f2118f186b0cea8d428b84f9..c7b623a1d6d0d3dfe69a4ac2deb3b7d3a351b8a8 100644 (file)
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -55,6 +55,24 @@
 #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
+
+
+/*
+ * 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/DASA_SIM.h b/include/configs/DASA_SIM.h
index b1638ce1a292f42fe1644af95de6f2fe645d2b8f..627ea14826bea26312614a1826cb0dc7962d4e70 100644 (file)
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -58,6 +58,15 @@
 #define CONFIG_SERVERIP                10.0.18.190
 
 
+/*
+ * 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/DK1C20.h b/include/configs/DK1C20.h
index c3bd2cb84152d6c392afe5b9d263970e53799a76..0ddf0e3aeb974c92901f5507b17960932a4cea28 100644 (file)
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -447,6 +447,15 @@
 #define CFG_NIOS_ASMIBASE      CFG_NIOS_CPU_ASMI0 /* ASMI base 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/DK1S10.h b/include/configs/DK1S10.h
index a5530a6c8dc874304c8865ad77e7c697593afcf9..0032fd3db71f1083fd40f9458da462f49291dedc 100644 (file)
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -454,6 +454,15 @@
 
 #endif /* CFG_NIOS_CPU_PIO_NUMS */
 
+/*
+ * 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/DP405.h b/include/configs/DP405.h
index b50d4f905b6cf399c7c5ebe680de4c3fc544fddc..2eadbea35d6968c2322f13b9ec6ac96932f380f3 100644 (file)
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -56,6 +56,15 @@
 #define CONFIG_PHY_ADDR                0       /* 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/DU405.h b/include/configs/DU405.h
index 2093b3736442e3cdef33347db367a96425582844..5c595f57d264c2f0a1bb769774d1633eba4006b4 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -59,6 +59,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/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 07f31d52c07a5db3f0ccb4f342a1e4dbe5f6ea52..a8697ec88de877e1e7a0010aa45e00c1acf4e664 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -69,6 +69,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/EP1C20.h b/include/configs/EP1C20.h
index db133c64407f219c3637976acd470eb1cb81dacb..cfa6335927a5c77ed13e4cff00a6718b85f09a01 100644 (file)
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -161,6 +161,15 @@
 #define CONFIG_SERVERIP                192.168.2.16
 
 
+/*
+ * 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/EP1S10.h b/include/configs/EP1S10.h
index 67a162d9d3a3cc4ae56baccef712136947f193ff..7c526f759e7acb32dda06f659b6314952ff38a93 100644 (file)
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -155,6 +155,15 @@
 #define CONFIG_SERVERIP                192.168.2.16
 
 
+/*
+ * 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/EP1S40.h b/include/configs/EP1S40.h
index 2363835b9f44303e8ff6eb88f4139c7497009d2f..1fe8f68c2e6f480a0e585b40b95a0be8b2ca19d2 100644 (file)
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -155,6 +155,15 @@
 #define CONFIG_SERVERIP                192.168.2.16
 
 
+/*
+ * 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/EP88x.h b/include/configs/EP88x.h
index 60a45086d65ed3fa058d3237daec842d65b0ac83..89e0eebeead22e21e88465d1492e545695791b8b 100644 (file)
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -50,6 +50,15 @@
 #define CFG_8xx_CPUCLK_MIN             40000000
 #define CFG_8xx_CPUCLK_MAX             133000000
 
+/*
+ * 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/ERIC.h b/include/configs/ERIC.h
index 2320747c36df4a46647ee5ad403d228d3b22ac7b..5d48d2bbb6888d0973c2e1f849fe1c360c17595e 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -97,6 +97,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/EXBITGEN.h b/include/configs/EXBITGEN.h
index fdbf1258229b9f89e2f9ca4c16e99b3cc57098a5..a3f38bb3a3237e542581cdbc596117ad6d7b7230 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -83,6 +83,15 @@
 #define CONFIG_PHY_ADDR                0       /* 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/FADS823.h b/include/configs/FADS823.h
index bc3957629ca9e5f16fcdfc3d1ce7bcfab28f0c44..a562b2fa4e86486875329e14c1ac0c0eb10d19e6 100644 (file)
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -46,7 +46,6 @@
 #define CFG_I2C_SPEED          400000  /* I2C speed and slave address */
 #define CFG_I2C_SLAVE          0x7F
 
-/*Now included by CFG_CMD_PCMCIA */
 /*#define CONFIG_PCMCIA                1       / * To enable PCMCIA support */
 
 /* Video related */

diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index c2238c9a96c8e889adbdcfe30ddcd45e8f408d49..c8ce25957b02a5e412f0f309301d488fd2977863 100644 (file)
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -62,6 +62,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/G2000.h b/include/configs/G2000.h
index 24eff02ac66b214be1f4a0aa5d5e18f6363d85d7..9c713c6c26f2fdca67f67efa14b4a59744cb34f1 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -89,6 +89,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/GENIETV.h b/include/configs/GENIETV.h
index 67525db3312fd133fd00daf7cc2fa409679f7501..785355a8e6679bde8b826308b254a9fa4e2525c3 100644 (file)
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -106,6 +106,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/GTH.h b/include/configs/GTH.h
index f398bad79a09f1d023f28704a0aa3cce50aa7e02..79f5714e6f0bd185e5b99877a6359305e56dc9c6 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -98,6 +98,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/HH405.h b/include/configs/HH405.h
index 58f29cd66674a0335522b449b14667808a188abf..00f481c4b52d0bc5ba3e0492bd19cb37bc397152 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -98,11 +98,18 @@
 #define CONFIG_VIDEO_BMP_GZIP          /* gzip compressed bmp images   */
 #define CFG_VIDEO_LOGO_MAX_SIZE        (2 << 20)       /* for decompressed img */
 
-#define ADD_BMP_CMD            CFG_CMD_BMP
-#else
-#define ADD_BMP_CMD            0
 #endif /* CONFIG_VIDEO */
 
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -120,9 +127,11 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_BMP_CMD
 #define CONFIG_CMD_EEPROM
 
+#ifdef CONFIG_VIDEO
+#define CONFIG_CMD_BMP
+#endif
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 972ca0884f2514630cb69c49d11b6641fc792685..26dd954c18a7eff11f31506475feed5f11d7f0f5 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -53,6 +53,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/HUB405.h b/include/configs/HUB405.h
index d29bddbe1caff54ce627e9021416e9cd9988e25b..661b895f9a1a796ec7fade0010ecc537015fe019 100644 (file)
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -61,6 +61,15 @@
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
 
 
+/*
+ * 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/IDS8247.h b/include/configs/IDS8247.h
index 455bbe3f6331900adfa3b43adf49baa585356f4b..85d2bb3f513f5e25d47c358b3e6f2146f7328fdf 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -303,7 +303,7 @@
 #define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)(adr + 0x0)) = (__u8)d; } while(0)
 #define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)(adr + 0x0)))
 
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
 
 /*-----------------------------------------------------------------------
  * Hard Reset Configuration Words

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index e6ef765662944f1afa2d9b0b2a6c35081d97744b..965b515f0e6f9d273af9b5b7b6c01f5350daae77 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -106,6 +106,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.
  */

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index c80c2d4ad3ca003990c808cb271df54cbd4a902e..cc902c842d563f88cbb229beed3dab9f41b936d0 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -64,7 +64,6 @@
 #define CONFIG_PCI_IO_BUS      0x50000000
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
-#define ADD_PCI_CMD            CFG_CMD_PCI
 #endif
 
 #define CFG_XLB_PIPELINING     1
@@ -75,11 +74,8 @@
 #define CFG_RX_ETH_BUFFER      8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
 
-#else  /* MPC5100 */
-
+#else
 #define CONFIG_MII             1
-#define ADD_PCI_CMD            0  /* no CFG_CMD_PCI */
-
 #endif
 
 /* Partitions */
@@ -90,15 +86,21 @@
 /* USB */
 #if 1
 #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
 
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -110,8 +112,11 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
-#define CONFIG_PCI_CMD
-#define CONFIG_USB_CMD
+#define CONFIG_CMD_USB
+
+#if defined(CONFIG_PCI)
+#define CONFIG_CMD_PCI
+#endif
 
 
 #if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */