include/configs/[p-z]* + misc: 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/board/fads/fads.h b/board/fads/fads.h
index 8558b7426be22d7fda8adbd292e46fe80e8589ed..75237818cefe3846fb25306ba5aa6e1e71bebb85 100644 (file)
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -95,6 +95,16 @@
 #define CFG_DISCOVER_PHY
 #endif
 
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 #if !defined(FADS_COMMANDS_ALREADY_DEFINED)
 /*
  * Command line configuration.

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3334f0fe99a720b30b6dee223f2202cbed1e6a2b..45a7d81792d6cb0661a76ed2a851aaeca0bc4af5 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -341,6 +341,15 @@
 #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/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 1984157e1cf4891a486dd28f5b3659d3ff356453..f62ca2c42bea298e74ffd4821dec3abefd97ad2e 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -423,6 +423,15 @@
 #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/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 41b1ae1206cb07a1b6a84ffb1c9c840f6c6d8d24..eef168c252d469d8b1efc31f2ccb9e6aa8aad702 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -384,6 +384,15 @@ extern unsigned long get_clock_freq(void);
 #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/acadia.h b/include/configs/acadia.h
index 5bd8ac63e1d1758bd137f787e38a26edcdcc7410..e3f6e2c8b34afdd83fd0a631b872b316c48f3eb5 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -299,6 +299,15 @@
 
 #define CONFIG_SUPPORT_VFAT
 
+/*
+ * 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/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 487ca6a1897e90712c44107c967e53d7211a2d4f..6cb6bc4f71c815f7fb86640173f50353740c0061 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -97,6 +97,15 @@
 #define CONFIG_LOADS_ECHO      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/bf533-stamp.h b/include/configs/bf533-stamp.h
index f93c61e4b7b1a158c8e4ad99e83343258f8af2be..cce6ef79f272e35fefd1a96c77f359d7f13bd3f4 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -289,6 +289,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/bf537-stamp.h b/include/configs/bf537-stamp.h
index bea157a45f6efe8eea45281d942014cbce49c687..b9a9e3cb79203294f9320bc4cc920be7a20d8353 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -163,6 +163,15 @@
 #define CONFIG_NETCONSOLE      1
 #define CONFIG_NET_MULTI       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/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 40f5abc7438814143148e6d14ae8dc64d14363d3..29662604f99266e7d2d5847501619ffd5da22ac8 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -187,6 +187,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/integratorap.h b/include/configs/integratorap.h
index be3b1140bb18faefaa510993f792e945ba768ff1..1452bf2c46769637854edef70c38f786200a7062 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -69,6 +69,15 @@
 /*#define CONFIG_NET_MULTI */
 
 
+/*
+ * 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/integratorcp.h b/include/configs/integratorcp.h
index 191c5e61e3238b84072cd6a6ab5918fe26813239..69310d4dfbc56aaab0f0808c52e61dadbb9e592f 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -71,6 +71,15 @@
 #define CFG_SERIAL1            0x17000000
 
 
+/*
+ * 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/katmai.h b/include/configs/katmai.h
index 9258e7dd8094d941f7f543ae366a6ab73307ec0f..110ad44ee1bc5fc115a6332893fd715bc8e42de1 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -211,6 +211,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/lwmon5.h b/include/configs/lwmon5.h
index 13cbed5e9a5a082a0317c0e1f3a0459890539037..f24dac41704ffa86501caeba080c18c96fe4c315 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -224,6 +224,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.
  */

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 6cfc9478a24aafd574303ddaf215ed8efa925c69..7eeae708a72f1e0fefb83ffe9a7ddda058aec8ac 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -145,6 +145,15 @@
        #define CFG_FLASH_PROTECTION            /* hardware flash protection */
 #endif /* !FLASH */
 
+/*
+ * 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/motionpro.h b/include/configs/motionpro.h
index 7a61e4939566e0a281ab39c2af04cd5b275a8ee7..e0a827fdd71f328be6e6b5a1436a38cecf1dfe46 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -36,6 +36,15 @@
 #define CONFIG_MOTIONPRO       1       /* ... on Promess Motion-PRO board */
 
 
+/*
+ * 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/p3p440.h b/include/configs/p3p440.h
index 2a429614aaf77a763b9f97b84e8e3639cc96d9db..51f19a1456c404130bbc44bcc243cc200bc8d74d 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -169,6 +169,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/pb1x00.h b/include/configs/pb1x00.h
index c84795b6ab0a506d902f91d580f4bcfa8b2bc571..810e0f0462875938afb0585b5efcc7f07dba8892 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -177,6 +177,15 @@
 #define CFG_CACHELINE_SIZE     32
 
 
+/*
+ * 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/pcs440ep.h b/include/configs/pcs440ep.h
index f0cd8d3c02f785ab642be9f26b2a22dda085e154..aa66c30f0ea6d22b4c6b84d15fd91df7b116b40a 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -209,6 +209,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/pdnb3.h b/include/configs/pdnb3.h
index 5d6e169c26a92555403b5d654288f58bc81c42d6..5b5b0efb76acb063054d1c391064903ab4704a3f 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -72,6 +72,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/pf5200.h b/include/configs/pf5200.h
index 3e72c652bc7979310006b6476c8c8f2bee3b66fc..18d0c879a9ed474ca2580074b78721df76f825cb 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -85,13 +85,6 @@
 #define CFG_RX_ETH_BUFFER      8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
 #endif
-
-#define ADD_PCI_CMD            CFG_CMD_PCI
-
-#else                          /* MPC5100 */
-
-#define ADD_PCI_CMD            0       /* no CFG_CMD_PCI */
-
 #endif
 
 /* Partitions */
@@ -101,26 +94,35 @@
 /* USB */
 #if 0
 #define CONFIG_USB_OHCI
-#define ADD_USB_CMD            CFG_CMD_USB | CFG_CMD_FAT
 #define CONFIG_USB_STORAGE
-#else
-#define ADD_USB_CMD            0
 #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>
 
 #define CONFIG_CMD_BSP
-#define CONFIG_PCI_CMD
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 
+#ifdef CONFIG_MPC5200
+#define CONFIG_CMD_PCI
+#endif
+
 
 #if (TEXT_BASE == 0xFF000000)  /* Boot low with 16 MB Flash */
 #   define CFG_LOWBOOT         1

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index f581fe5e23f4277f81e2759e0efb7119030e53bf..863029d146d8511e100f96f777df16ab742b1dda 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -67,6 +67,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/ppmc7xx.h b/include/configs/ppmc7xx.h
index 6a3bd33d2e9d1c00d05e285f53b6269c2957cb41..6e451d8b6cbce1d87b8e77dd12f4ed931ade5684 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -68,6 +68,15 @@
  * CMD_PCI             - PCI Bus scanning command
  */
 
+/*
+ * 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/purple.h b/include/configs/purple.h
index 61e18d7b7154133dce4727dd6b0d038bb632b1d7..6eb618ed6d3ca8cb5b4512c335c02942e55194d2 100644 (file)
--- a/include/configs/purple.h
+++ b/include/configs/purple.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/pxa255_idp.h b/include/configs/pxa255_idp.h
index d7e4e8ac2b11b64bb88b4945d8071b2c3be98220..0e884fc114c9b8ea3c5fa545885ecc044424103d 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -103,6 +103,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/r5200.h b/include/configs/r5200.h
index 05929390010ff4b4261d6adb3d06f60d81f8651c..0e743bb2e48afed426b5f4000d9158c10b52b0cf 100644 (file)
--- a/include/configs/r5200.h
+++ b/include/configs/r5200.h
@@ -67,6 +67,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/rsdproto.h b/include/configs/rsdproto.h
index 93f5c6be8d8baf1582540d943a198118d89d17dc..814082ccc633bd20a4deafdf56514baa51cd37ee 100644 (file)
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -102,6 +102,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/sbc2410x.h b/include/configs/sbc2410x.h
index fe06be674cd5c3770f4d5b06dcf62b60da46476d..b4a063a1d4c6ad3c199b0b41e917dc4e27265aa6 100644 (file)
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -83,6 +83,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/sbc8349.h b/include/configs/sbc8349.h
index 81322dfc70cfad49bb0dc4c8f1acd02a43d05b13..83a81fec1398e8cb05850f9f4c89dcaa9f4e5f09 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -440,6 +440,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/sbc8560.h b/include/configs/sbc8560.h
index ad610f031a6f805dae6242e624e8be37157182c0..defc428819b4a6c98af2b439df6f6bde70c1fdcf 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -321,6 +321,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/sc3.h b/include/configs/sc3.h
index 9709fe292c2715426c989e55b3b0a19f5dbc633f..cb2253698719ff7f637f42426c2ef42e4d875941 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -168,6 +168,15 @@
 #define CONFIG_MII 1                   /* add 405GP MII PHY management         */
 #define CONFIG_PHY_ADDR 1      /* the connected Phy defaults to address 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/sc520_cdp.h b/include/configs/sc520_cdp.h
index 8689be4df3f0febb5b3943d4fd3700e193675d24..8491d97ae421607a70736e694d5f7ff876be6f44 100644 (file)
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -66,6 +66,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/sc520_spunk.h b/include/configs/sc520_spunk.h
index e761ca7b55bc4542d12f8a0ca934dc73ec244364..c6f7f1526c63170b209069be62bd0bfacbfafad3 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -65,6 +65,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/scb9328.h b/include/configs/scb9328.h
index 489c35ff4b4c410379f88ce1a7acc2ec2e9066a8..d140241bff485a729edb0ecb814b1e995b41ca86 100644 (file)
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -35,6 +35,15 @@
  */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -180,7 +189,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.
  */
 #define CFG_JFFS2_FIRST_BANK           0
 #define CFG_JFFS2_FIRST_SECTOR         5

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 14a64e8c3fc939c4a08238abb8b0fdad6fee27a7..ec6e9bd6b31a13d2c2c372d82d32ed10e8882ac5 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -307,6 +307,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.
  */

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index cad38d0c00d179ae2cd4c61c3209224079e78d44..c1fa53f1a8a5e1bccca3bc7488f08587e95e5df5 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -67,6 +67,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/smdk2400.h b/include/configs/smdk2400.h
index 22e69725b37145adfc6730d2821d333ec7bf671f..05f6053727064dc040021b020671f9c968a924d8 100644 (file)
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -87,6 +87,15 @@
 #define CONFIG_RTC_S3C24X0     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/smdk2410.h b/include/configs/smdk2410.h
index cd3d32765472c8346ccd54504168b5a4f16ed5f7..ca404ff452a5ec0b7bb12a5130f59761660a2264 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -73,6 +73,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/smmaco4.h b/include/configs/smmaco4.h
index a965e8ac8ee40c6cf9b8dc40e370a2bdd16daad7..ad68c751c89388e67fe6fd584f5f0abc6b32c040 100644 (file)
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -65,6 +65,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -338,8 +347,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/sorcery.h b/include/configs/sorcery.h
index e8f4cfac3ff4d401d183b1a1dd3df50ae4692f0f..fe014eabcbc1c79d476d012b40ae775cdd83e02e 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -64,6 +64,15 @@
 #define CONFIG_PCI_CFG_SIZE    0x01000000
 
 
+/*
+ * 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/spc1920.h b/include/configs/spc1920.h
index ea6a11237d2d06193c3569375e765da51b3123fe..b4ab9ad9726f39fa22ec016c0feb306642492770 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -81,6 +81,15 @@
 #define CONFIG_BZIP2    /* include support for bzip2 compressed images */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -194,7 +203,7 @@
 #define CFG_CACHELINE_SIZE     16      /* For all MPC8xx CPUs                  */
 #define CFG_CACHELINE_SHIFT    4       /* log base 2 of the above value        */
 
-#ifdef CFG_CMD_DATE
+#ifdef CONFIG_CMD_DATE
 # define CONFIG_RTC_DS3231
 # define CFG_I2C_RTC_ADDR      0x68
 #endif

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index ccfcf1c8dc080fe6a2e2658bce8bd8dc2ca1eef3..4b618f36a8714d0d5005026a457c9212253684b2 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -121,6 +121,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -419,8 +428,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/stxgp3.h b/include/configs/stxgp3.h
index 9c55844dfe897bfedaec6b998e38aa83fa603c09..1f41cf7699e0ac4dac768d677790251c9a518754 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -298,6 +298,15 @@
 #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/stxssa.h b/include/configs/stxssa.h
index f480bd530f4526df961ba69ceea684c748edab08..a880931cb1c9f71369cb95c42c464c8a279109f5 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -326,6 +326,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/suzaku.h b/include/configs/suzaku.h
index cb1a2e6a1a0b8632972c9c1ff8007a04b21e03c5..08ac9cbd58ba4f4a3285dea5f02132b4eb63225e 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -56,6 +56,15 @@
 #define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0)
 
 
+/*
+ * 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/taishan.h b/include/configs/taishan.h
index 4889f7026b8b84ef003a864739238d39373dca5c..baa4fbd312b1b14c410fe5a182ea3c244a32b6ed 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -235,6 +235,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/tb0229.h b/include/configs/tb0229.h
index df031753d6a53bd32d30ea9e46399bf5ac1704e5..a21af219a7ec30af54502237cce7d0847329eacf 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -88,6 +88,15 @@
 #define CONFIG_BOOTCOMMAND     "run netboot"
 
 
+/*
+ * 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/trab.h b/include/configs/trab.h
index a696b634a9adb703677207d3de9b7200f86330e9..52bcbfc158b5895d0d80881f2b7a1c8fa5853696 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -131,6 +131,15 @@
 #define CONFIG_RTC_S3C24X0     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/uc101.h b/include/configs/uc101.h
index 64461f6a90ebd87bbbb9ba452fa664d9c6257035..3b471d0a97fb3f7e92152d30cc83b18a94df9f62 100644 (file)
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.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.
  */
@@ -265,8 +274,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/utx8245.h b/include/configs/utx8245.h
index f3995431447ab58a2547b9eb97a24cf61260b3d5..cd00c49fc224eee40682ca474f3b10b8592835dc 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -87,6 +87,15 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 #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.
  */

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 3e3d11674ed3889fb783bc08d6d932ab006f8a5c..c0b1a15e6b2b7efe235f9a6fcdcafea32ba92e93 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -85,6 +85,15 @@
 #define CONFIG_USB_CONFIG      0x00001000
 
 
+/*
+ * 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/walnut.h b/include/configs/walnut.h
index 2112b53179528f3395eb4920e08c981f70b68dfe..180549efad38c8ecb53d269aad6c22beea2c17b5 100644 (file)
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -99,6 +99,15 @@
 #define CONFIG_RTC_DS174x      1       /* use DS1743 RTC in Walnut     */
 
 
+/*
+ * 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/wepep250.h b/include/configs/wepep250.h
index 3b360402decb55800c36347263cc8f289c18089a..c67b30122761b18183afdef51d5cd916eb409824 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -35,6 +35,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.
  */
@@ -149,7 +158,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.
  */
 #define CFG_JFFS2_FIRST_BANK           0
 #define CFG_JFFS2_FIRST_SECTOR         5

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1149542bbe242b5e721413e21b1f64f65ad4b6a3..7418986caacbf4d3767125f493d953cb655dd915 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -65,6 +65,15 @@
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
 
 
+/*
+ * 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/xm250.h b/include/configs/xm250.h
index 225d46a38aeff260eb74054da9ade62fc058ab2a..bcd16ec5da026222813766c64ddc02498c6fcb0f 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -82,6 +82,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/xsengine.h b/include/configs/xsengine.h
index 37daefe87ef7da8beb6de1d048107799b20d25f6..5733933d616906d697979a36cc71b915402d7114 100644 (file)
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -103,6 +103,15 @@
 /* allow to overwrite serial and ethaddr */
 #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/xupv2p.h b/include/configs/xupv2p.h
index cfa12811351f61f0af518179230c0b694b270a87..35001d7ada3108e2bcba95505e7571680c1d8a57 100644 (file)
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -120,6 +120,15 @@
 #define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
 
+/*
+ * 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/yosemite.h b/include/configs/yosemite.h
index 853e4bcc0dd67d2a8326eb36c498f4ce3ff9eb3b..dd6d9acdd5de4163f8471289286d07e8fd60f9de 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -249,6 +249,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/yucca.h b/include/configs/yucca.h
index ab323aaab43e67d3b4d2913bf0966dbd36041d77..9c536fd12da9cd17a5a185a7670d63351c520cbd 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -192,6 +192,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/zylonite.h b/include/configs/zylonite.h
index 3e636a27d2d0e2e9b33a13a5fab1bd80a8728fb2..517ecb13b7f963cc3856beb9834cb5e300b43345 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -77,6 +77,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.
  */