Convert CONFIG_BOOTP_SERVERIP to Kconfig

This converts the following to Kconfig:
   CONFIG_BOOTP_SERVERIP

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 560a18177c2246cbd7cee335553aab19894e6437..65b3a40004509eadc3baaa3036f2889cccb72b3e 100644 (file)
--- a/README
+++ b/README
@@ -1203,9 +1203,6 @@ The following options need to be configured:
                CONFIG_BOOTP_VENDOREX
                CONFIG_BOOTP_MAY_FAIL
 
-               CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
-               environment variable, not the BOOTP server.
-
                CONFIG_BOOTP_MAY_FAIL - If the DHCP server is not found
                after the configured retry count, the call will fail
                instead of starting over.  This can be used to fail over

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index a6c7fc5bfdebf673e1c45b32c46e88ce76a8b895..06ac349e2e7ad0baa36fc641a22cd65102e927ec 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -173,6 +173,7 @@ config STM32_ETZPC
        bool "STM32 Extended TrustZone Protection"
        depends on STM32MP15x
        default y
+       imply BOOTP_SERVERIP
        help
          Say y to enable STM32 Extended TrustZone Protection
 

diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig
index b79b5b6ffa8d004efe8df2b29bf71a411b8a38ab..9f7b268f27425ac2c856a9ff5f0d3a51fd82f0bf 100644 (file)
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MMC=y

diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 503f2ae13120f883433db4f5e7eee55d828a0b71..49108ec716747e505fccab3ae0a08fabb40f391f 100644 (file)
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x80140000
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_DM=y
 CONFIG_MMC=y
 CONFIG_FTSDC010=y

diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig
index ffeee33fe5c8ebf5d1df6c54579f3d32a48ea4e0..26dce00b29a896bb1a035708e37154dc7dfa52c0 100644 (file)
--- a/configs/bitmain_antminer_s9_defconfig
+++ b/configs/bitmain_antminer_s9_defconfig
@@ -57,6 +57,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_FPGA_XILINX=y

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index d849989cf61c4709eb012c43f641435bc885b36a..bdf805ad1974ba4ebf688e6e6de89b1bf3ee6856 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -96,6 +96,7 @@ CONFIG_ENV_IMPORT_FDT=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_DM_DMA=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 4f413582fb2d32ca455b68a5e324901927eec4db..70c6b2f80506b0539d4aacf4ff1c6bf509190be9 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -121,6 +121,7 @@ CONFIG_ENV_IMPORT_FDT=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_DM_DMA=y
 CONFIG_DEVRES=y
 CONFIG_DEBUG_DEVRES=y

diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
index 4d5a73fce0932a8acdb81ed6972a35b8734a7a73..3f69fb7464e3e13941bede2f817e0eddea72a2eb 100644 (file)
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -76,6 +76,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_DM_DMA=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig
index 490368e768f7f20eeff4f645f8996955633abf7c..6679c4335b2206d1026f0f85c0a4b18bfc589162 100644 (file)
--- a/configs/sandbox_noinst_defconfig
+++ b/configs/sandbox_noinst_defconfig
@@ -96,6 +96,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_SPL_DM=y
 CONFIG_DM_DMA=y
 CONFIG_REGMAP=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index f1a54ace9bcd6adf9e53045114d1dde6fb11e83c..fddf132dfedf95517e25671cacf895f98ba9fc71 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -98,6 +98,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y
+CONFIG_BOOTP_SERVERIP=y
 CONFIG_SPL_DM=y
 CONFIG_DM_DMA=y
 CONFIG_REGMAP=y

diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index 58e8526048987b7bd89cb58506d869a89649a0db..cd32b8815caee3f3e022b3fb6a08b9f36f99ce7b 100644 (file)
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -17,8 +17,6 @@
 
 #define CONFIG_SKIP_TRUNOFF_WATCHDOG
 
-#define CONFIG_BOOTP_SERVERIP
-
 #ifdef CONFIG_SKIP_LOWLEVEL_INIT
 #ifdef CONFIG_OF_CONTROL
 #undef CONFIG_OF_SEPARATE

diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 1022764985a2ebfc1242b29fd68477513ec641a5..e46c8f07772da2e5f6aeba47de15b0b3370e63f9 100644 (file)
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -15,8 +15,6 @@
  */
 #define CONFIG_USE_INTERRUPT
 
-#define CONFIG_BOOTP_SERVERIP
-
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_MEM_REMAP
 #endif

diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h
index a9f45f19295a7828c946f319fda19c182d7daa24..2bcd0e1a989d97e782101f590f4c965b6d245c7c 100644 (file)
--- a/include/configs/bitmain_antminer_s9.h
+++ b/include/configs/bitmain_antminer_s9.h
@@ -9,8 +9,6 @@
 #define CONFIG_SYS_SDRAM_BASE  0x00000000
 #define CONFIG_SYS_SDRAM_SIZE  0x40000000
 
-#define CONFIG_BOOTP_SERVERIP
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "autoload=no\0" \
        "pxefile_addr_r=0x2000000\0" \

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 5c2f3d84c3b59999d5f654bd85ae4fae8a5679a4..9e0e8c7056f212b1d1b229b39f68b1caad142857 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -25,8 +25,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-#define CONFIG_BOOTP_SERVERIP
-
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL
 #endif

diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index dab679f71e3d7ab4b303ed568ec0b6d1b2bd359b..2bbc8def82019229fac2ed3d04f18a07a42d3152 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -57,7 +57,6 @@
 /* Ethernet need */
 #ifdef CONFIG_DWC_ETH_QOS
 #define CONFIG_SERVERIP                 192.168.1.1
-#define CONFIG_BOOTP_SERVERIP
 #define CONFIG_SYS_AUTOLOAD            "no"
 #endif
 

diff --git a/net/Kconfig b/net/Kconfig
index e5b583751562f3351fad30201e16013e2405cffb..2ae9d6a02036d0b1b4c2d675c5b452cca50da029 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -116,4 +116,11 @@ config UDP_CHECKSUM
          is wrong then the packet is discussed and an error is shown, like
          "UDP wrong checksum 29374a23 30ff3826"
 
+config BOOTP_SERVERIP
+       bool "Use the 'serverip' env var for tftp, not bootp"
+       help
+         Enable this if the TFTP server will be the 'serverip' environment
+         variable, not the BOOTP server. This affects the operation of both
+         bootp and tftp.
+
 endif   # if NET