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>

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 0247b7d25c0d85a100d079d476b439beedca07f9..c2a50c1f473816307f6d660bdaf7ac12ae664fb8 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -72,6 +72,15 @@
 #define CONFIG_BOOTCOMMAND     "ide reset;disk 0x81000000 0:2;run addmisc;bootm"
 
 
+/*
+ * 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/hmi1001.h b/include/configs/hmi1001.h
index 7e1897a7593f509bf73d70ccd79c408dce93925e..6c15b4e14c01fbd6271a800704b13db0e869ca92 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -51,6 +51,15 @@
 #define CONFIG_DOS_PARTITION
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 8a3ad6861e471be09f648902f8718c8b6b76e28f..b789067f81d01bc2c6874ae538960e318acd1c51 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -173,6 +173,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.
  */

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 99266334636683355e2e92e340edb55d675c03c8..1ab7b27a5d894added363ca0f3b839e5919b9cce 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -79,6 +79,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/incaip.h b/include/configs/incaip.h
index ef8f7249574d6cc4ee1a663127addd5b64e8986d..4caf54efd318cb4cfbc8ebd05b93ed912910b781 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -82,6 +82,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/inka4x0.h b/include/configs/inka4x0.h
index 19f2f194f6a2be8fee6a0ad8c109040d28be5d45..0fac28fadd70d128cb799b9d811ad2cec26ef0d0 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -72,6 +72,15 @@
 #define CONFIG_ISO_PARTITION
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 38ccf89cd1ead9780b370738741170adfcdcf9fc..5310e0d428fd50b0adb7890a429d112faa5f097f 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -55,6 +55,15 @@
 #define CONFIG_MISC_INIT_R     1       /* we have a misc_init_r() function */
 
 
+/*
+ * 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 8c1ab242f3c25051a4b154ccd5f38b1e57d7711e..bc5f9e19bdc3b266ca99e86964da559750ee7c5a 100644 (file)
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -54,6 +54,15 @@
 #define CONFIG_BAUDRATE         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/ixdpg425.h b/include/configs/ixdpg425.h
index 6c103ce6f321e78edf1bb9612ea19671382c6f22..da59230bb6568b5ec04de837f3334c3778a8e2b1 100644 (file)
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -76,6 +76,15 @@
 #define CFG_IXP425_CONSOLE     IXP425_UART1   /* we use UART1 for console */
 
 
+/*
+ * 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/jupiter.h b/include/configs/jupiter.h
index e53b848c34aa229b6f1f48d98ceb95e1d5470929..b68c5aa46e57e218b03a73fa6b2f555cff1d609c 100644 (file)
--- 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
@@ -83,6 +82,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.
  */
@@ -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 4741ead81555478aaa0ad93ca6c4ad6352d92a60..75d9c3b3b46ef52a2c16084c195ead5909162361 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -79,6 +79,15 @@
 #define CONFIG_ENV_OVERWRITE   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/lart.h b/include/configs/lart.h
index 98bc3b257b8de72d4d4b2c8fcf5f4c730e0c8378..8f18c9f1b1bfc4ed36f17deeed4728ccad81ed59 100644 (file)
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -60,6 +60,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/logodl.h b/include/configs/logodl.h
index 7c11eeb707147904c967177ede7c667bda6968f6..2b2d37751e0901d46514f2cc2ad5895d144c846f 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -55,6 +55,15 @@
 #undef CONFIG_MISC_INIT_R              /* FIXME: misc_init_r() missing     */
 
 
+/*
+ * 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/lpd7a400.h b/include/configs/lpd7a400.h
index 414cb14da8bb4ae7a000cdb8a17608d474ac6d37..04148898eaca979f87197467d55cb9ef72df5fa6 100644 (file)
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -56,6 +56,15 @@
 #define        CONFIG_TIMESTAMP        1       /* Print timestamp info for images */
 
 
+/*
+ * 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/lpd7a404.h b/include/configs/lpd7a404.h
index 87815cb170f9288c2a9ea54d143ac3e4ee217d0e..11ede968180822bea92f7397e38d895e74009f72 100644 (file)
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -56,6 +56,15 @@
 #define        CONFIG_TIMESTAMP        1       /* Print timestamp info for images */
 
 
+/*
+ * 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/luan.h b/include/configs/luan.h
index 82af2fb0759be0ffd2899b859be5162556f76621..72aae09d03971a831e037b25441c8b45130f7c9c 100644 (file)
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -214,6 +214,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/lubbock.h b/include/configs/lubbock.h
index eed589066e015a6f6684aea338c018d90546ad23..4adf2542219fbaeb7d4284ef41f28a087c74b0a2 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -68,6 +68,15 @@
 #define CONFIG_BAUDRATE                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/mcc200.h b/include/configs/mcc200.h
index 10e25f02290fed78728392fe648297543393d0e2..744f551c3e88dcbbc79948c8869cd057bc4a8921 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -92,6 +92,15 @@
 #define CONFIG_AUTO_UPDATE 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/mecp5200.h b/include/configs/mecp5200.h
index 6f0d4973f00404b0c09b5c8aae5cdb8b91fd3642..49919fbafbbf3aac0bd149e7b2cd30c8aedbceaa 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.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.
  */

diff --git a/include/configs/ml300.h b/include/configs/ml300.h
index 423c6ebbb77403abd5107b835986d9cf02341367..0183041842af27139d5f25a5d2a052a7ee1d25c2 100644 (file)
--- a/include/configs/ml300.h
+++ b/include/configs/ml300.h
@@ -88,6 +88,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/mp2usb.h b/include/configs/mp2usb.h
index 3a6224012a2ceb0335b34a8a8e153d50a26efcfd..8d6f2613c17434cd87d2f22cd3a5681d8cba623a 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -129,6 +129,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/mx1ads.h b/include/configs/mx1ads.h
index 0ae2780f202cbea769141f386f65e3e2ce031d83..5125b21e04f372f7158472604ad10a9627de4a54 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -79,6 +79,15 @@
 #define CONFIG_BAUDRATE                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/mx1fs2.h b/include/configs/mx1fs2.h
index 47ca0f1eee2432c8d133e406161ac9217d274316..d527d098f5774ae43cdf81239bf67d787596d2ba 100644 (file)
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -35,6 +35,15 @@
 #undef CONFIG_SILENT_CONSOLE  /* use this to disable output */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -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 e1806a70c6093c81e4685cead8c8e3552463f966..1d691f9731d22849f5bf39a1f9afdabeab14416a 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -70,6 +70,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/o2dnt.h b/include/configs/o2dnt.h
index 9ed1ed856c831435a0827e0ed5febbf34b38491e..f1d73e4c5396f1147e637e77d5af67302f611d42 100644 (file)
--- 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
@@ -78,6 +76,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.
  */
@@ -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 fd45c1d970515ae1eb560c8b317c12766c2b9a80..bc2fd33ff5e912748896341400cf96df8f1d2c4c 100644 (file)
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -233,6 +233,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.
  */