include/configs/[P-Z]: Cleanup BOOTP and lingering CFG_CMD_.

PATCH New Jon Loeliger 1 participant 1 message Jul 10, 2007

Share & tools

Jon Loeliger

author

2007-07-10 16:33 UTC #0 lore raw

PATCH 3/14 include/configs/[P-Z]*: 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 <[email protected]>

---
 include/configs/PATI.h           |    9 +++++++++
 include/configs/PCI405.h         |    9 +++++++++
 include/configs/PCI5441.h        |    9 +++++++++
 include/configs/PIP405.h         |    9 +++++++++
 include/configs/PK1C20.h         |    9 +++++++++
 include/configs/PLU405.h         |    9 +++++++++
 include/configs/PM520.h          |    9 +++++++++
 include/configs/PM854.h          |    9 +++++++++
 include/configs/PM856.h          |    9 +++++++++
 include/configs/PMC405.h         |    9 +++++++++
 include/configs/PN62.h           |    9 +++++++++
 include/configs/PPChameleonEVB.h |    9 +++++++++
 include/configs/RPXsuper.h       |    9 +++++++++
 include/configs/Rattler.h        |   11 ++++++++++-
 include/configs/SBC8540.h        |    9 +++++++++
 include/configs/SL8245.h         |    9 +++++++++
 include/configs/SX1.h            |    9 +++++++++
 include/configs/SXNI855T.h       |    9 +++++++++
 include/configs/Sandpoint8240.h  |    9 +++++++++
 include/configs/Sandpoint8245.h  |    9 +++++++++
 include/configs/TASREG.h         |    9 +++++++++
 include/configs/TB5200.h         |   12 ++++++++++--
 include/configs/TOP5200.h        |    9 +++++++++
 include/configs/TQM5200.h        |   12 ++++++++++--
 include/configs/TQM8272.h        |   14 ++++++++------
 include/configs/TQM834x.h        |    9 +++++++++
 include/configs/TQM85xx.h        |    9 +++++++++
 include/configs/TQM885D.h        |    3 +--
 include/configs/Total5200.h      |    9 +++++++++
 include/configs/VCMA9.h          |    9 +++++++++
 include/configs/VOH405.h         |    9 +++++++++
 include/configs/VoVPN-GW.h       |    9 +++++++++
 include/configs/W7OLMC.h         |    9 +++++++++
 include/configs/W7OLMG.h         |    9 +++++++++
 include/configs/WUH405.h         |    9 +++++++++
 include/configs/XPEDITE1K.h      |    9 +++++++++
 include/configs/Yukon8220.h      |    9 +++++++++
 include/configs/ZPC1900.h        |    9 +++++++++
 38 files changed, 336 insertions(+), 13 deletions(-)

include/configs/PATI.h +9 -0

index b0f8615..0de7591 100644
@@ -41,6 +41,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */
 #define CONFIG_CMD_MEMORY

include/configs/PCI405.h +9 -0

index 2dfd231..d6e7082 100644
@@ -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>

include/configs/PCI5441.h +9 -0

index 1bfcd37..24b25d9 100644
@@ -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.
  */
 #define CONFIG_CMD_BDI

include/configs/PIP405.h +9 -0

index 0a2d7d7..efa0157 100644
@@ -42,6 +42,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>

include/configs/PK1C20.h +9 -0

index 49a285c..d90351a 100644
@@ -162,6 +162,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */

include/configs/PLU405.h +9 -0

index 5742db6..5470373 100644
@@ -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>

include/configs/PM520.h +9 -0

index 3cd3511..5ba8f4a 100644
@@ -90,6 +90,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>

include/configs/PM854.h +9 -0

index d79dd76..dbf9422 100644
@@ -305,6 +305,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>

include/configs/PM856.h +9 -0

index 5681d43..6bdfa5d 100644
@@ -308,6 +308,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>

include/configs/PMC405.h +9 -0

index bdbc900..b29f368 100644
@@ -65,6 +65,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>

include/configs/PN62.h +9 -0

index 8346d8c..72acf5a 100644
@@ -43,6 +43,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>

include/configs/PPChameleonEVB.h +9 -0

index 709ce5f..dd1decd 100644
@@ -115,6 +115,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>

include/configs/RPXsuper.h +9 -0

index 1401da3..dfadd2a 100644
@@ -151,6 +151,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>

include/configs/Rattler.h +10 -1

index 5bdf571..d7652fa 100644
@@ -127,6 +127,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>

@@ -207,7 +216,7 @@
 #define MTDIDS_DEFAULT		"nor0=rattler-0"
 #define MTDPARTS_DEFAULT	"mtdparts=rattler-0:- at 1m(jffs2)"
 */
-#endif /* CFG_CMD_JFFS2 */
+#endif /* CONFIG_CMD_JFFS2 */
 
 #define CFG_MONITOR_BASE	TEXT_BASE
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)

include/configs/SBC8540.h +9 -0

index a5397c2..f2c3699 100644
@@ -340,6 +340,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>

include/configs/SL8245.h +9 -0

index b8e5c7d..4d9d41b 100644
@@ -55,6 +55,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>

include/configs/SX1.h +9 -0

index 588d345..05cef87 100644
@@ -95,6 +95,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>

include/configs/SXNI855T.h +9 -0

index efc500c..8f2a5ec 100644
@@ -148,6 +148,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>

include/configs/Sandpoint8240.h +9 -0

index d19c27e..5bbe3c5 100644
@@ -82,6 +82,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>

include/configs/Sandpoint8245.h +9 -0

index cbad484..a08451e 100644
@@ -53,6 +53,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>

include/configs/TASREG.h +9 -0

index b0116e7..2b2ae01 100644
@@ -52,6 +52,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>

include/configs/TB5200.h +10 -2

index 3d90efb..1c6a9ae 100644
@@ -88,6 +88,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>

@@ -408,8 +417,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * 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

include/configs/TOP5200.h +9 -0

index 73d25ea..7240ce1 100644
@@ -100,6 +100,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>

include/configs/TQM5200.h +10 -2

index 598c1c6..63d77e2 100644
@@ -148,6 +148,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>

@@ -580,8 +589,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * 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

include/configs/TQM8272.h +8 -6

index 05e2e9a..50f6752 100644
@@ -97,10 +97,6 @@
 /* enable I2C and select the hardware/software driver */
 #undef  CONFIG_HARD_I2C			/* I2C with hardware support	*/
 #define CONFIG_SOFT_I2C		1	/* I2C bit-banged		*/
-#define ADD_CMD_I2C		CFG_CMD_I2C	| \
-				CFG_CMD_DATE	|\
-				CFG_CMD_DTT	|\
-				CFG_CMD_EEPROM
 #define CFG_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CFG_I2C_SLAVE		0x7F

@@ -140,7 +136,6 @@
 #else
 #undef CONFIG_HARD_I2C
 #undef CONFIG_SOFT_I2C
-#define ADD_CMD_I2C		0
 #endif
 
 /*

@@ -295,6 +290,13 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 
+#if CONFIG_I2C
+    #define CONFIG_CMD_I2C
+    #define CONFIG_CMD_DATE
+    #define CONFIG_CMD_DTT
+    #define CONFIG_CMD_EEPROM
+#endif
+
 
 /*
  * Miscellaneous configurable options

@@ -439,7 +441,7 @@
 	WRITE_NAND(d, addr); \
 } while(0)
 
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
 
 #define	CONFIG_PCI
 #ifdef CONFIG_PCI

include/configs/TQM834x.h +9 -0

index 684cb30..c3efb7b 100644
@@ -316,6 +316,15 @@ extern int tqm834x_num_flash_banks;
 #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.
  */
 #include <config_cmd_default.h>

include/configs/TQM85xx.h +9 -0

index b17d5e3..d5ce3ba 100644
@@ -359,6 +359,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>

include/configs/TQM885D.h +1 -2

index 19fdaf0..f36b729 100644
@@ -198,8 +198,7 @@
 #define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
- * Enable loopw commando. This has only effect, if CFG_CMD_MEM is defined,
- * which is normally part of the default commands (CFV_CMD_DFL)
+ * Enable loopw command.
  */
 #define CONFIG_LOOPW

include/configs/Total5200.h +9 -0

index 2a1cb89..9edf790 100644
@@ -111,6 +111,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>

include/configs/VCMA9.h +9 -0

index ab802a3..df6894f 100644
@@ -50,6 +50,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>

include/configs/VOH405.h +9 -0

index 3f2c32b..34f0ebd 100644
@@ -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>

include/configs/VoVPN-GW.h +9 -0

index ebe634f..1405784 100644
@@ -138,6 +138,15 @@
 #endif
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */

include/configs/W7OLMC.h +9 -0

index fd81096..fc177fb 100644
@@ -71,6 +71,15 @@
 #define CONFIG_RTC_M48T35A	1		/* ST Electronics M48 timekeeper */
 
 /*
+ * 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>

include/configs/W7OLMG.h +9 -0

index a5ce685..20d693f 100644
@@ -77,6 +77,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>

include/configs/WUH405.h +9 -0

index f786520..c1b3da8 100644
@@ -62,6 +62,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>

include/configs/XPEDITE1K.h +9 -0

index 4b8fbe6..611f5a6 100644
@@ -184,6 +184,15 @@ extern void out32(unsigned int, unsigned long);
 
 
 /*
+ * 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>

include/configs/Yukon8220.h +9 -0

index 07fab44..00c4ff0 100644
@@ -66,6 +66,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>

include/configs/ZPC1900.h +9 -0

index fb5bc0f..7c1a5b9 100644
@@ -108,6 +108,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>

Signature · 1 line

1.5.2.2.249.g45fd