summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-10 09:29:01 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-10 09:29:01 -0500
commit80ff4f99b84b64edca3fd10da365ec1493be1c95 (patch)
treebc27069012648f0aaca46fc9850eb35be130b67c /include
parenta1aa0bb502e25fd598b5e0ccdfb2c174921d714a (diff)
include/configs/[a-e]*: 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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/adsvix.h9
-rw-r--r--include/configs/aev.h12
-rw-r--r--include/configs/alpr.h9
-rw-r--r--include/configs/at91rm9200dk.h9
-rw-r--r--include/configs/bamboo.h9
-rw-r--r--include/configs/barco.h3
-rw-r--r--include/configs/bubinga.h9
-rw-r--r--include/configs/canmb.h9
-rw-r--r--include/configs/cerf250.h9
-rw-r--r--include/configs/cm4008.h9
-rw-r--r--include/configs/cm41xx.h9
-rw-r--r--include/configs/cmc_pu2.h9
-rw-r--r--include/configs/cmi_mpc5xx.h9
-rw-r--r--include/configs/cobra5272.h9
-rw-r--r--include/configs/cogent_mpc8260.h9
-rw-r--r--include/configs/cogent_mpc8xx.h9
-rw-r--r--include/configs/cpci5200.h9
-rw-r--r--include/configs/cradle.h9
-rw-r--r--include/configs/csb226.h9
-rw-r--r--include/configs/csb637.h9
-rw-r--r--include/configs/dbau1x00.h9
-rw-r--r--include/configs/debris.h9
-rw-r--r--include/configs/delta.h9
-rw-r--r--include/configs/dnp1110.h9
-rw-r--r--include/configs/eXalion.h9
-rw-r--r--include/configs/ebony.h9
-rw-r--r--include/configs/ep8248.h13
-rw-r--r--include/configs/ep8260.h9
-rw-r--r--include/configs/ep82xxm.h13
29 files changed, 259 insertions, 7 deletions
diff --git a/include/configs/adsvix.h b/include/configs/adsvix.h
index 0d64013b212..703d3124e6f 100644
--- a/include/configs/adsvix.h
+++ b/include/configs/adsvix.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.
*/
#include <config_cmd_default.h>
diff --git a/include/configs/aev.h b/include/configs/aev.h
index 93b20db5cea..5bab793e9cc 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -92,6 +92,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>
@@ -343,8 +352,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/alpr.h b/include/configs/alpr.h
index 27f2831b525..d88c3ad43b0 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.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/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index db57dc11f12..ecfa21d8280 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -99,6 +99,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/bamboo.h b/include/configs/bamboo.h
index c1fdaf8d570..19b29aaf36c 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -318,6 +318,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/barco.h b/include/configs/barco.h
index 09078d42c62..0bb446f7844 100644
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -92,6 +92,8 @@
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_PCI
+#undef CONFIG_CMD_NET
+
#define CONFIG_HUSH_PARSER 1 /* use "hush" command parser */
#define CONFIG_BOOTDELAY 1
@@ -116,7 +118,6 @@
*/
#define CONFIG_PCI /* include pci support */
#undef CONFIG_PCI_PNP
-#undef CFG_CMD_NET
#define PCI_ENET0_IOADDR 0x80000000
#define PCI_ENET0_MEMADDR 0x80000000
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 16892590e00..7736a1e32d0 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -139,6 +139,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/canmb.h b/include/configs/canmb.h
index 9bb5b830471..d577b95e05d 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -49,6 +49,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/cerf250.h b/include/configs/cerf250.h
index 0240ef2194a..e06735da631 100644
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -63,6 +63,15 @@
#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.
*/
#include <config_cmd_default.h>
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index d0ac46b3caf..ae40b358e95 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -60,6 +60,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/cm41xx.h b/include/configs/cm41xx.h
index b62e3611736..c1dd33d1d25 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -60,6 +60,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/cmc_pu2.h b/include/configs/cmc_pu2.h
index 9e70900cb70..f32c8c2c66b 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -114,6 +114,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/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index dbc41e97fbf..cd92af23522 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -46,6 +46,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/cobra5272.h b/include/configs/cobra5272.h
index 4ab60cf2717..510524ad36a 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.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/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 63150902c87..84d50c71dd5 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.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/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index c246ff5e648..ce38af1dd85 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -60,6 +60,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/cpci5200.h b/include/configs/cpci5200.h
index c4ed19abdd1..ce4ea1f8dbe 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -100,6 +100,15 @@
#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>
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 5d6419fe1f2..eb93a8f083f 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -63,6 +63,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/csb226.h b/include/configs/csb226.h
index 04bdf867b17..0be0f219248 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -59,6 +59,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/csb637.h b/include/configs/csb637.h
index ac2fe54409d..976dae39f69 100644
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -101,6 +101,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/dbau1x00.h b/include/configs/dbau1x00.h
index c0f5a099001..b2f606f498b 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -81,6 +81,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/debris.h b/include/configs/debris.h
index 96c76483aaf..7667e5e60e3 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -124,6 +124,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/delta.h b/include/configs/delta.h
index 7df72800f58..dbfe7a702b5 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.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/dnp1110.h b/include/configs/dnp1110.h
index e58a2f219c8..d32e0460234 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.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/eXalion.h b/include/configs/eXalion.h
index ac1ef959a70..f8e2c885b06 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -59,6 +59,15 @@
/*#define CONFIG_DRAM_SPEED 66 */ /* MHz */
/*
+ * 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/ebony.h b/include/configs/ebony.h
index d86a9efbefd..2c626a03288 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.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/ep8248.h b/include/configs/ep8248.h
index 8653b55affe..85ad70a0d50 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -125,6 +125,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>
@@ -192,13 +201,13 @@
#define CFG_JFFS2_LAST_SECTOR 62
#define CFG_JFFS2_SORT_FRAGMENTS
#define CFG_JFFS_CUSTOM_PART
-#endif /* CFG_CMD_JFFS2 */
+#endif
#if defined(CONFIG_CMD_I2C)
#define CONFIG_HARD_I2C 1 /* To enable I2C support */
#define CFG_I2C_SPEED 100000 /* I2C speed */
#define CFG_I2C_SLAVE 0x7F /* I2C slave address */
-#endif /* CFG_CMD_I2C */
+#endif
#define CFG_MONITOR_BASE TEXT_BASE
#if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 25f9bd6a718..f412ec8ed80 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -292,6 +292,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_all.h>
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 430ff4b8f48..4febd322a4f 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -110,6 +110,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>
@@ -318,13 +327,13 @@
#define CFG_JFFS2_LAST_SECTOR 62
#define CFG_JFFS2_SORT_FRAGMENTS
#define CFG_JFFS_CUSTOM_PART
-#endif /* CFG_CMD_JFFS2 */
+#endif
#if defined(CONFIG_CMD_I2C)
#define CONFIG_HARD_I2C 1 /* To enable I2C support */
#define CFG_I2C_SPEED 100000 /* I2C speed */
#define CFG_I2C_SLAVE 0x7F /* I2C slave address */
-#endif /* CFG_CMD_I2C */
+#endif
#define CFG_MONITOR_BASE TEXT_BASE
#if (CFG_MONITOR_BASE < CFG_FLASH_BASE)