net: Convert CONFIG_TFTP_BLOCKSIZE to Kconfig

Convert CONFIG_TFTP_BLOCKSIZE to Kconfig, update defconfigs,
headers and whitelist.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig
index 7848b68c21b74ac5b99efc3fc0641ccfe2b82610..584e54d5356b3c6b63f504b8e792b2fc4375d136 100644 (file)
--- a/configs/apalis-imx8qm_defconfig
+++ b/configs/apalis-imx8qm_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_DM_GPIO=y

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 141260f44b76de13f65ccacfad5f719163d9f357..41f3aff149232750cb4065e638efbc57926e0b41 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 0daf758c27bd1f6781ec397bd1821a61b5c8cff9..6f36f7b82ed3d400c2c4ff31374c2261518744c3 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -55,6 +55,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index cd1a679cb352d79ab1c6aa1558972eeb711864b1..cf4d14434d67611372c040daee7d85e45bd7c677 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index e2755ecab56fe5e75831b242f5d2683ae21a0ec5..5c89439f7b3833984761010d90cd15069a2a3a84 100644 (file)
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index f73236ca05e494d233d1d6f6cfd99631023c9006..d808bd760888cb3da8233e31d62d02cdd0bbc9ca 100644 (file)
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 712db4514e5abe1eec6a5fcc598ebb0f42b9b188..a60d6951c92d5d7753f2073d82606dffdd5b6a4e 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -55,6 +55,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 25191d1a9184a9c28602dbb13e8e8a36ec1cb5c3..efbf5f55a321bd08b1516c438cc4d438f13acbbb 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_FSL_CAAM=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index 23228246d80e8ff74d16ed46719c72725a52f4ee..89f43e5fb9f59e14f10d5c8a35bc2852bfbd928d 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -42,6 +42,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_FSL_CAAM=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 8247248f1c42f1f98bf7e7982d6d806ee0d8d5d0..d6a20ca6426fa6adcd2546a712bee129f6adddc9 100644 (file)
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -37,6 +37,7 @@ CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=1536
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 3d25f10e1a55d72d39cfcbdb5c4a98bb7568c007..769f6f3c9e676cdcdd75d51de5362842cdd063bc 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig
index 9000573cdad2918ba391efd2bf51049f2aefc251..3ce6c031ad881c27041cb8ef78ddf640d84f16ad 100644 (file)
--- a/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 8cdd7c7a4b0e10f898d2157f3678a9d26172d2b5..780ae618e0c8cf37d08f47e3d1b7f6d542ebd691 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -29,7 +29,6 @@
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_TFTP_BLOCKSIZE          SZ_4K
 #define CONFIG_TFTP_TSIZE
 
 #define CONFIG_IPADDR                  192.168.10.2

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 51d1261cae6f158c435c21fbd1046cf99c029f77..b4ddd1bdc64164146ae71c68c049e02211eecffb 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -31,7 +31,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 #undef CONFIG_IPADDR

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 0c01fdcbd2c1df1bb932b621ea152e152858e152..4b0a3fb26b348421a14b8a5670006c91cee4da63 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -59,7 +59,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         6
-#define CONFIG_TFTP_BLOCKSIZE          4096
 #define CONFIG_TFTP_TSIZE
 
 /* USB Configs */

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index c085be8b5f9bd67f5f1d4e9ac80b3f27d9e400eb..f6adfeb96a56c0a8e254d1d89f0a35be5d476c8c 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -28,7 +28,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* Increase console I/O buffer size */

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 20f5440cb25e2f6072e0ed53003bb8ea19b2e11a..21d9a3da01fa47818dfeae468dd7f1386185ca74 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
 /* Network */
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* ENET1 */

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 8e7454433de56fe2c6507dc81af89df44e5078d3..e15bab29ba4182b174aac0be886cd0eded22e7fc 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -29,7 +29,6 @@
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_TFTP_BLOCKSIZE          SZ_4K
 #define CONFIG_TFTP_TSIZE
 
 #define CONFIG_IPADDR                  192.168.10.2

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 2dfb7bd861c1026de299c96652b5b7e0bd13e31c..86f3f0d4fa2d666a931f9bef17832c7c2e207d75 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -50,7 +50,6 @@
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* USB Configs */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index c19e27b9deefb9bac36eb74029efd045c26ca785..40173b18fa77f7acab2cee04ee15eba67e662c15 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -22,7 +22,6 @@
 #define CONFIG_ETHPRIME                 "FEC"
 #define CONFIG_FEC_MXC_PHYADDR          0
 
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* ENET1 */

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index dd9f7225a039f202491ec67efb14eed5acd47abe..cd7e1687812c3cdcc338cdc07c132ecc456d62a8 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -18,7 +18,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_TEGRA2
 
 /* General networking support */
-#define CONFIG_TFTP_BLOCKSIZE          1536
 #define CONFIG_TFTP_TSIZE
 
 /* LCD support */

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index a816ade3101c460c493680426659b825703fc0ad..8ff6433f45d211dfa0e942cfca0d57f29632fd8f 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MMC_ENV_PART                1
 
 /* General networking support */
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 /* Increase console I/O buffer size */

diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index b2521df3db0a32bf3933ea0408b30b7b66a01e57..296f4502c65200ecbe7d4b5cf4301d6cc1f8d77c 100644 (file)
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -41,8 +41,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#define CONFIG_TFTP_BLOCKSIZE  4096
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LOAD_ADDR           0x8000000
 

diff --git a/net/Kconfig b/net/Kconfig
index 1a6fda9ebcf8423bb950aa9da2f6d67d31b77ed6..68cecf75a2c5643f9bea8dc48da5bb8360e526a6 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -29,4 +29,10 @@ config IP_DEFRAG
          Selecting this will enable IP datagram reassembly according
          to the algorithm in RFC815.
 
+config TFTP_BLOCKSIZE
+       int "TFTP block size"
+       default 512
+       help
+         Default TFTP block size.
+
 endif   # if NET

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8ec700f6cadb7334dbd74b6e3d6fd4c48deb7715..2a465d0d55b766e2e41d72dda47dcb382b88bd0f 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4250,7 +4250,6 @@ CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_TEST_LIST_SORT
 CONFIG_TFP410_I2C_ADDR
-CONFIG_TFTP_BLOCKSIZE
 CONFIG_TFTP_FILE_NAME_MAX_LEN
 CONFIG_TFTP_PORT
 CONFIG_TFTP_TSIZE