From a5562901661bd428f7e5feb333f796372cb81019 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Sun, 8 Jul 2007 15:31:57 -0500
Subject: include/configs: Use new CONFIG_CMD_* in various [TUVWZYZ]* named
 board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 include/configs/VOH405.h | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'include/configs/VOH405.h')

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 96f3d26cc..3f2c32b6b 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -58,28 +58,31 @@
 
 #define CONFIG_PHY_CLK_FREQ	EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
 
-#define CONFIG_COMMANDS	      ( CONFIG_CMD_DFL	| \
-				CFG_CMD_DHCP	| \
-				CFG_CMD_PCI	| \
-				CFG_CMD_IRQ	| \
-				CFG_CMD_IDE	| \
-				CFG_CMD_FAT	| \
-				CFG_CMD_ELF	| \
-				CFG_CMD_NAND	| \
-				CFG_CMD_DATE	| \
-				CFG_CMD_I2C	| \
-				CFG_CMD_MII	| \
-				CFG_CMD_PING	| \
-				CFG_CMD_EEPROM	)
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_EEPROM
+
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_SUPPORT_VFAT
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
 
 #define CONFIG_RTC_MC146818		/* DS1685 is MC146818 compatible*/
@@ -98,7 +101,7 @@
 #define CFG_PROMPT_HUSH_PS2	"> "
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define CFG_CBSIZE	256		/* Console I/O Buffer Size	*/
@@ -319,7 +322,7 @@
 #define CFG_DCACHE_SIZE		16384	/* For AMCC 405 CPUs, older 405 ppc's	*/
 					/* have only 8kB, 16kB is save here	*/
 #define CFG_CACHELINE_SIZE	32	/* ...			*/
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT	5	/* log base 2 of the above value	*/
 #endif
 
-- 
cgit v1.2.3


From a1aa0bb502e25fd598b5e0ccdfb2c174921d714a Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 09:22:23 -0500
Subject: 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 <jdl@freescale.com>
---
 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(-)

(limited to 'include/configs/VOH405.h')

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index b0f86157d..0de7591da 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -40,6 +40,15 @@
 #define CONFIG_BAUDRATE		9600
 
 
+/*
+ * 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/PCI405.h b/include/configs/PCI405.h
index 2dfd23117..d6e7082f6 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -69,6 +69,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.
  */
diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 1bfcd37d0..24b25d985 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -123,6 +123,15 @@
 #define	CFG_HZ		(CONFIG_SYS_CLK_FREQ/(CFG_NIOS_TMRCNT + 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/PIP405.h b/include/configs/PIP405.h
index 0a2d7d7f9..efa015746 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -41,6 +41,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/PK1C20.h b/include/configs/PK1C20.h
index 49a285c5d..d90351add 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.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/PLU405.h b/include/configs/PLU405.h
index 5742db6f2..54703731a 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -62,6 +62,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/PM520.h b/include/configs/PM520.h
index 3cd3511f7..5ba8f4a4e 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.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/PM854.h b/include/configs/PM854.h
index d79dd768f..dbf94228a 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -304,6 +304,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/PM856.h b/include/configs/PM856.h
index 5681d4336..6bdfa5d8f 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -307,6 +307,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/PMC405.h b/include/configs/PMC405.h
index bdbc900ba..b29f368f5 100644
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -64,6 +64,15 @@
 #define CONFIG_NETCONSOLE		/* include NetConsole support	*/
 
 
+/*
+ * 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/PN62.h b/include/configs/PN62.h
index 8346d8ca0..72acf5ae8 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -42,6 +42,15 @@
 #define CONFIG_CONS_INDEX	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/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 709ce5f0e..dd1decdcd 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -114,6 +114,15 @@
 #define CONFIG_PHY_CLK_FREQ	EMAC_STACR_CLK_66MHZ
 
 
+/*
+ * 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/RPXsuper.h b/include/configs/RPXsuper.h
index 1401da35a..dfadd2a11 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -150,6 +150,15 @@
 #define CFG_PROMPT              "=> "
 
 
+/*
+ * 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/Rattler.h b/include/configs/Rattler.h
index 5bdf57193..d7652fa9b 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -126,6 +126,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.
  */
@@ -207,7 +216,7 @@
 #define MTDIDS_DEFAULT		"nor0=rattler-0"
 #define MTDPARTS_DEFAULT	"mtdparts=rattler-0:-@1m(jffs2)"
 */
-#endif /* CFG_CMD_JFFS2 */
+#endif /* CONFIG_CMD_JFFS2 */
 
 #define CFG_MONITOR_BASE	TEXT_BASE
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index a5397c2e0..f2c3699ab 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -339,6 +339,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/SL8245.h b/include/configs/SL8245.h
index b8e5c7de7..4d9d41b92 100644
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -54,6 +54,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/SX1.h b/include/configs/SX1.h
index 588d3459e..05cef873e 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -94,6 +94,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.
  */
diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index efc500ca5..8f2a5ece2 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -147,6 +147,15 @@
 #define CFG_DISCOVER_PHY
 
 
+/*
+ * 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/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index d19c27e84..5bbe3c591 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -81,6 +81,15 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 
+/*
+ * 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/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index cbad484b0..a08451eb3 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -52,6 +52,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/TASREG.h b/include/configs/TASREG.h
index b0116e7ac..2b2ae01f6 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -51,6 +51,15 @@
 #undef CONFIG_MONITOR_IS_IN_RAM	              /* no pre-loader required!!! ;-) */
 
 
+/*
+ * 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/TB5200.h b/include/configs/TB5200.h
index 3d90efb1c..1c6a9ae4f 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -87,6 +87,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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
 
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 73d25ea86..7240ce128 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -99,6 +99,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/TQM5200.h b/include/configs/TQM5200.h
index 598c1c61c..63d77e294 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -147,6 +147,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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
 
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 05e2e9ac1..50f67524f 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -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
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 684cb3045..c3efb7bb9 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -315,6 +315,15 @@ extern int tqm834x_num_flash_banks;
 #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/TQM85xx.h b/include/configs/TQM85xx.h
index b17d5e30f..d5ce3ba71 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -358,6 +358,15 @@
 #define	CONFIG_TIMESTAMP		/* Print image info with ts	*/
 
 
+/*
+ * 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/TQM885D.h b/include/configs/TQM885D.h
index 19fdaf0b6..f36b729cd 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -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
 
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 2a1cb89ad..9edf79022 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -110,6 +110,15 @@
 #define CONFIG_USB_STORAGE
 
 
+/*
+ * 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/VCMA9.h b/include/configs/VCMA9.h
index ab802a3cd..df6894f32 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -49,6 +49,15 @@
 #define CONFIG_INITRD_TAG	 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/VOH405.h b/include/configs/VOH405.h
index 3f2c32b6b..34f0ebdcf 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -59,6 +59,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/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index ebe634f13..14057847b 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -137,6 +137,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/W7OLMC.h b/include/configs/W7OLMC.h
index fd810961d..fc177fb1f 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -70,6 +70,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.
  */
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index a5ce68541..20d693fa4 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -76,6 +76,15 @@
 #define CFG_DTT_HYSTERESIS	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/WUH405.h b/include/configs/WUH405.h
index f7865200c..c1b3da863 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.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/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 4b8fbe6f4..611f5a62c 100644
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -183,6 +183,15 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_HAS_ETH3		1	/* add support for "eth3addr"	*/
 
 
+/*
+ * 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/Yukon8220.h b/include/configs/Yukon8220.h
index 07fab4431..00c4ff093 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.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/ZPC1900.h b/include/configs/ZPC1900.h
index fb5bc0fdb..7c1a5b9e8 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -107,6 +107,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.
  */
-- 
cgit v1.2.3