[U-Boot-Users] [PATCH 05/14] include/configs/[g-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/gth2.h | 9 +++++++++ include/configs/hmi1001.h | 12 ++++++++++-- include/configs/hymod.h | 9 +++++++++ include/configs/idmr.h | 9 +++++++++ include/configs/incaip.h | 9 +++++++++ include/configs/inka4x0.h | 12 ++++++++++-- include/configs/innokom.h | 9 +++++++++ include/configs/ixdp425.h | 9 +++++++++ include/configs/ixdpg425.h | 9 +++++++++ include/configs/jupiter.h | 14 +++++++++++++- include/configs/kb9202.h | 9 +++++++++ include/configs/lart.h | 9 +++++++++ include/configs/logodl.h | 9 +++++++++ include/configs/lpd7a400.h | 9 +++++++++ include/configs/lpd7a404.h | 9 +++++++++ include/configs/luan.h | 9 +++++++++ include/configs/lubbock.h | 9 +++++++++ include/configs/mcc200.h | 9 +++++++++ include/configs/mecp5200.h | 9 +++++++++ include/configs/ml300.h | 9 +++++++++ include/configs/mp2usb.h | 9 +++++++++ include/configs/mx1ads.h | 9 +++++++++ include/configs/mx1fs2.h | 11 ++++++++++- include/configs/ns9750dev.h | 9 +++++++++ include/configs/o2dnt.h | 13 ++++++++++--- include/configs/ocotea.h | 9 +++++++++ 26 files changed, 242 insertions(+), 9 deletions(-)

diff --git a/include/configs/gth2.h b/include/configs/gth2.h index 0247b7d..c2a50c1 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -73,6 +73,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/hmi1001.h b/include/configs/hmi1001.h index 7e1897a..6c15b4e 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -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> @@ -242,8 +251,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/hymod.h b/include/configs/hymod.h index 8a3ad68..b789067 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -174,6 +174,15 @@ #define CONFIG_LAST_STAGE_INIT

/* + * 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/idmr.h b/include/configs/idmr.h index 9926633..1ab7b27 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -80,6 +80,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/incaip.h b/include/configs/incaip.h index ef8f724..4caf54e 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -83,6 +83,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/inka4x0.h b/include/configs/inka4x0.h index 19f2f19..0fac28f 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -73,6 +73,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> @@ -259,8 +268,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/innokom.h b/include/configs/innokom.h index 38ccf89..5310e0d 100644 --- a/include/configs/innokom.h +++ b/include/configs/innokom.h @@ -56,6 +56,15 @@

/* + * 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/ixdp425.h b/include/configs/ixdp425.h index 8c1ab24..bc5f9e1 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -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> diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h index 6c103ce..da59230 100644 --- a/include/configs/ixdpg425.h +++ b/include/configs/ixdpg425.h @@ -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> diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index e53b848..b68c5aa 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -66,7 +66,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 @@ -84,6 +83,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> @@ -91,6 +99,10 @@ #define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP

+#if defined(CONFIG_PCI) +#define CODFIG_CMD_PCI +#endif +

/* * Autobooting diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index 4741ead..75d9c3b 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -80,6 +80,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/lart.h b/include/configs/lart.h index 98bc3b2..8f18c9f 100644 --- a/include/configs/lart.h +++ b/include/configs/lart.h @@ -61,6 +61,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/logodl.h b/include/configs/logodl.h index 7c11eeb..2b2d377 100644 --- a/include/configs/logodl.h +++ b/include/configs/logodl.h @@ -56,6 +56,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_ASKENV diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h index 414cb14..0414889 100644 --- a/include/configs/lpd7a400.h +++ b/include/configs/lpd7a400.h @@ -57,6 +57,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/lpd7a404.h b/include/configs/lpd7a404.h index 87815cb..11ede96 100644 --- a/include/configs/lpd7a404.h +++ b/include/configs/lpd7a404.h @@ -57,6 +57,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/luan.h b/include/configs/luan.h index 82af2fb..72aae09 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -215,6 +215,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/lubbock.h b/include/configs/lubbock.h index eed5890..4adf254 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -69,6 +69,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/mcc200.h b/include/configs/mcc200.h index 10e25f0..744f551 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -93,6 +93,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/mecp5200.h b/include/configs/mecp5200.h index 6f0d497..49919fb 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -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> diff --git a/include/configs/ml300.h b/include/configs/ml300.h index 423c6eb..0183041 100644 --- a/include/configs/ml300.h +++ b/include/configs/ml300.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/mp2usb.h b/include/configs/mp2usb.h index 3a62240..8d6f261 100644 --- a/include/configs/mp2usb.h +++ b/include/configs/mp2usb.h @@ -130,6 +130,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/mx1ads.h b/include/configs/mx1ads.h index 0ae2780..5125b21 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -80,6 +80,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/mx1fs2.h b/include/configs/mx1fs2.h index 47ca0f1..d527d09 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -36,6 +36,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> @@ -159,7 +168,7 @@ * Right now there is no gain for user, but later on booting kernel might be * possible. Consider using XIP kernel running from flash to save RAM * footprint. - * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support. + * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support. */

/* diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index e1806a7..1d691f9 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -71,6 +71,15 @@

/* + * 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/o2dnt.h b/include/configs/o2dnt.h index 9ed1ed8..f1d73e4 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -68,8 +68,6 @@ #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1

-#define ADD_PCI_CMD CFG_CMD_PCI - /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -79,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> @@ -89,7 +96,7 @@ #define CONFIG_CMD_NFS #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_PCI_CMD +#define CONFIG_CMD_PCI

#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index fd45c1d..bc2fd33 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -234,6 +234,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>