[PoC 176/241] global: Migrate CONFIG_SERVERIP to CFG

Tom Rini
2022-11-20T14:16:11Z

README | 2 +-
doc/README.usb | 2 +-
include/configs/M5208EVBE.h | 2 +-
include/configs/M5235EVB.h | 2 +-
include/configs/M5272C3.h | 2 +-
include/configs/M5282EVB.h | 2 +-
include/configs/M53017EVB.h | 2 +-
include/configs/M5329EVB.h | 2 +-
include/configs/M5373EVB.h | 2 +-
include/configs/MCR3000.h | 2 +-
include/configs/MPC8548CDS.h | 2 +-
include/configs/apalis-imx8.h | 2 +-
include/configs/apalis-tk1.h | 4 ++--
include/configs/apalis_imx6.h | 4 ++--
include/configs/cobra5272.h | 2 +-
include/configs/colibri-imx6ull.h | 2 +-
include/configs/colibri-imx8x.h | 2 +-
include/configs/colibri_imx6.h | 4 ++--
include/configs/colibri_imx7.h | 2 +-
include/configs/colibri_vf.h | 2 +-
include/configs/gw_ventana.h | 2 +-
include/configs/integratorcp.h | 2 +-
include/configs/mt7622.h | 2 +-
include/configs/mt7623.h | 2 +-
include/configs/mt7629.h | 2 +-
include/configs/mvebu_alleycat-5.h | 2 +-
include/configs/poleg.h | 2 +-
include/configs/stm32mp15_common.h | 2 +-
include/configs/uniphier.h | 2 +-
include/env_default.h | 4 ++--
net/bootp.c | 10 +++++-----
scripts/config_whitelist.txt | 2 +-
32 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/README b/README
index 903bd1d8ff2d..aa989f67e2c0 100644
--- a/README
+++ b/README
@@ -743,7 +743,7 @@ The following options need to be configured:
(Environment variable "ipaddr")

- Server IP address:
- CONFIG_SERVERIP
+ CFG_SERVERIP

Defines a default value for the IP address of a TFTP
server to contact when using the "tftboot" command.
diff --git a/doc/README.usb b/doc/README.usb
index 495b1859a771..431942fbc32c 100644
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -163,7 +163,7 @@ and all the parameters can either get stored in the board's external
environment, or get obtained from the bootp server if not set.

#define CFG_IPADDR 10.0.0.2 (replace with your value)
-#define CONFIG_SERVERIP 10.0.0.1 (replace with your value)
+#define CFG_SERVERIP 10.0.0.1 (replace with your value)
#define CONFIG_BOOTFILE "uImage"

The 'usb start' command should identify the adapter something like this:
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 8eb5f7084f86..efbdc4c28afa 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -20,7 +20,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* CONFIG_MCFFEC */

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index b42177688427..ff99b6ab857d 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -29,7 +29,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* FEC_ENET */

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 043e188189e1..fcd3106ccb6d 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -32,7 +32,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* CONFIG_MCFFEC */

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 88e3d72ef67f..adcaa164d3e0 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -32,7 +32,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* CONFIG_MCFFEC */

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 35c37a4449b1..c86eef2210e2 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -33,7 +33,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* FEC_ENET */

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 8bb270ce6797..cc65740957a0 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -25,7 +25,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* FEC_ENET */

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 1f904efa84bb..c2171281eab7 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -27,7 +27,7 @@
#ifdef CONFIG_MCFFEC
# define CFG_IPADDR 192.162.1.2
# define CFG_NETMASK 255.255.255.0
-# define CONFIG_SERVERIP 192.162.1.1
+# define CFG_SERVERIP 192.162.1.1
# define CFG_GATEWAYIP 192.162.1.1
#endif /* FEC_ENET */

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 1248b367ae62..f5c887714f39 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -53,7 +53,7 @@
"bootm ${loadaddr} - 0xf00000\0"

#define CFG_IPADDR 192.168.0.3
-#define CONFIG_SERVERIP 192.168.0.1
+#define CFG_SERVERIP 192.168.0.1
#define CFG_NETMASK 255.0.0.0

/* Miscellaneous configurable options */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d752a9050001..d47378e19352 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -331,7 +331,7 @@
#define CFG_ROOTPATH "/nfsroot"
#define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */

-#define CONFIG_SERVERIP 192.168.1.1
+#define CFG_SERVERIP 192.168.1.1
#define CFG_GATEWAYIP 192.168.1.1
#define CFG_NETMASK 255.255.255.0

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 8f7841163936..580d2e3020ed 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -16,7 +16,7 @@
/* Networking */
#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
+#define CFG_SERVERIP 192.168.10.1

#define MEM_LAYOUT_ENV_SETTINGS \
"fdt_addr_r=0x84000000\0" \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 387fb3f69c83..7fd99ea907d1 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -36,8 +36,8 @@
#undef CFG_IPADDR
#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP 192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP 192.168.10.1

#define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \
"boot part 0 1 mmcpart 0; " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 4f2addd42d8b..02de22ce6a24 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -38,8 +38,8 @@
#undef CFG_IPADDR
#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP 192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP 192.168.10.1

#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index b0acdb2e7d62..df24e3014f00 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -71,7 +71,7 @@ enter a valid image address in flash */
/* User network settings */

#define CFG_IPADDR 192.168.100.2 /* default board IP address */
-#define CONFIG_SERVERIP 192.168.100.1 /* default tftp server IP address */
+#define CFG_SERVERIP 192.168.100.1 /* default tftp server IP address */

#endif

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 3cf56e98faf8..b744ae1d6e85 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -22,7 +22,7 @@

#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
+#define CFG_SERVERIP 192.168.10.1

#if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)
#define UBOOT_UPDATE \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 0c879cc06bc7..fc8da4f9e358 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -16,7 +16,7 @@

#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
+#define CFG_SERVERIP 192.168.10.1

#define MEM_LAYOUT_ENV_SETTINGS \
"fdt_addr_r=0x83000000\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index c0d5e6f0aa06..e34d933abae2 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -33,8 +33,8 @@
#undef CFG_IPADDR
#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP 192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP 192.168.10.1

#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index fdaeb6588146..8efcc8c17b3d 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -23,7 +23,7 @@

#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
+#define CFG_SERVERIP 192.168.10.1

#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
#define UBOOT_UPDATE \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 3da98a5165e4..83c79aa53fcb 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -18,7 +18,7 @@

#define CFG_IPADDR 192.168.10.2
#define CFG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
+#define CFG_SERVERIP 192.168.10.1

#define CFG_FDTADDR 0x84000000

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index d82856f5eb10..4d0acdd0f3b6 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -58,6 +58,6 @@

/* Environment */
#define CFG_IPADDR 192.168.1.1
-#define CONFIG_SERVERIP 192.168.1.146
+#define CFG_SERVERIP 192.168.1.146

#endif /* __CONFIG_H */
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index ccf73604480b..d1b2d938ff9f 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -19,7 +19,7 @@
/* Integrator CP-specific configuration */
#define CFG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */

-#define CONFIG_SERVERIP 192.168.1.100
+#define CFG_SERVERIP 192.168.1.100
#define CFG_IPADDR 192.168.1.104

/*
diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 199da46ad018..f0459f1e44ed 100644
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -19,6 +19,6 @@

/* Ethernet */
#define CFG_IPADDR 192.168.1.1
-#define CONFIG_SERVERIP 192.168.1.3
+#define CFG_SERVERIP 192.168.1.3

#endif
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index d3cf6597a633..b279fb44cfb7 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -34,7 +34,7 @@

/* Ethernet */
#define CFG_IPADDR 192.168.1.1
-#define CONFIG_SERVERIP 192.168.1.2
+#define CFG_SERVERIP 192.168.1.2

#ifdef CONFIG_DISTRO_DEFAULTS

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 8c0b02b40e50..d7700673f6f7 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -29,6 +29,6 @@

/* Ethernet */
#define CFG_IPADDR 192.168.1.1
-#define CONFIG_SERVERIP 192.168.1.2
+#define CFG_SERVERIP 192.168.1.2

#endif
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 10db30cd5366..3b0b269b3ad3 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -16,7 +16,7 @@

/* Default Env vars */
#define CFG_IPADDR 0.0.0.0 /* In order to cause an error */
-#define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */
+#define CFG_SERVERIP 0.0.0.0 /* In order to cause an error */
#define CFG_NETMASK 255.255.255.0
#define CFG_GATEWAYIP 0.0.0.0
#define CFG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index e824af8273a1..af0ed0002c83 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -14,7 +14,7 @@
#define CFG_SYS_SDRAM_BASE 0x0

/* Default environemnt variables */
-#define CONFIG_SERVERIP 192.168.0.1
+#define CFG_SERVERIP 192.168.0.1
#define CFG_IPADDR 192.168.0.2
#define CFG_NETMASK 255.255.255.0
#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index ec8c8fba91f1..85ddf1750768 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -25,7 +25,7 @@

/* Ethernet need */
#ifdef CONFIG_DWC_ETH_QOS
-#define CONFIG_SERVERIP 192.168.1.1
+#define CFG_SERVERIP 192.168.1.1
#endif

#define STM32MP_FIP_IMAGE_GUID \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 47086a7c9cc8..6ea5f2f83784 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -46,7 +46,7 @@
/*
* Network Configuration
*/
-#define CONFIG_SERVERIP 192.168.11.1
+#define CFG_SERVERIP 192.168.11.1
#define CFG_IPADDR 192.168.11.10
#define CFG_GATEWAYIP 192.168.11.1
#define CFG_NETMASK 255.255.255.0
diff --git a/include/env_default.h b/include/env_default.h
index 06cf3e36d692..95e00c27f0b6 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -56,8 +56,8 @@ const char default_environment[] = {
#ifdef CFG_IPADDR
"ipaddr=" __stringify(CFG_IPADDR) "\0"
#endif
-#ifdef CONFIG_SERVERIP
- "serverip=" __stringify(CONFIG_SERVERIP) "\0"
+#ifdef CFG_SERVERIP
+ "serverip=" __stringify(CFG_SERVERIP) "\0"
#endif
#ifdef CONFIG_SYS_DISABLE_AUTOLOAD
"autoload=0\0"
diff --git a/net/bootp.c b/net/bootp.c
index 6c01e3815320..61cf853059bd 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -183,7 +183,7 @@ static void store_bootp_params(struct bootp_hdr *bp)
*/
static void store_net_params(struct bootp_hdr *bp)
{
-#if !defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if !defined(CFG_SERVERIP_FROM_PROXYDHCP)
store_bootp_params(bp);
#endif
net_copy_ip(&net_ip, &bp->bp_yiaddr);
@@ -1056,7 +1056,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
"%d\n", src, dest, len, dhcp_state);

if (net_read_ip(&bp->bp_yiaddr).s_addr == 0) {
-#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if defined(CFG_SERVERIP_FROM_PROXYDHCP)
store_bootp_params(bp);
#endif
return;
@@ -1081,11 +1081,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
CONFIG_IS_ENABLED(NET_DEVICES))
efi_net_set_dhcp_ack(pkt, len);

-#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if defined(CFG_SERVERIP_FROM_PROXYDHCP)
if (!net_server_ip.s_addr)
- udelay(CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS *
+ udelay(CFG_SERVERIP_FROM_PROXYDHCP_DELAY_MS *
1000);
-#endif /* CONFIG_SERVERIP_FROM_PROXYDHCP */
+#endif /* CFG_SERVERIP_FROM_PROXYDHCP */

debug("TRANSITIONING TO REQUESTING STATE\n");
dhcp_state = REQUESTING;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0d58f8ff0a1b..9abd8a58bc37 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -185,7 +185,7 @@ CFG_SCIF_A
CFG_SCSI_DEV_LIST
CFG_SC_TIMER_CLK
CFG_SERIAL_BOOT
-CONFIG_SERVERIP
+CFG_SERVERIP
CONFIG_SETUP_INITRD_TAG
CONFIG_SET_DFU_ALT_BUF_LEN
CONFIG_SH_ETHER_ALIGNE_SIZE
--
2.25.1