Skip to contentSkip to conversation

net: Convert CONFIG_IP_DEFRAG to Kconfig

PATCH New Marek Vasut 3 participants 6 messages Jun 11, 2019 – Jun 15, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 net: Convert CONFIG_IP_DEFRAG to Kconfig

Convert CONFIG_IP_DEFRAG to Kconfig, update defconfigs, headers and whitelist. This patch is a follow-up on a patch by Christian Gmeiner with the added config/header/whitelist updates.

---
 configs/apalis-tk1_defconfig         | 1 +
 configs/apalis_imx6_defconfig        | 1 +
 configs/apalis_t30_defconfig         | 1 +
 configs/colibri-imx6ull_defconfig    | 1 +
 configs/colibri_imx6_defconfig       | 1 +
 configs/colibri_imx7_defconfig       | 1 +
 configs/colibri_imx7_emmc_defconfig  | 1 +
 configs/colibri_t20_defconfig        | 1 +
 configs/colibri_t30_defconfig        | 1 +
 configs/sandbox64_defconfig          | 1 +
 configs/sandbox_defconfig            | 1 +
 configs/sandbox_flattree_defconfig   | 1 +
 configs/sandbox_noblk_defconfig      | 1 +
 configs/sandbox_spl_defconfig        | 1 +
 configs/tools-only_defconfig         | 1 +
 configs/xilinx_versal_virt_defconfig | 1 +
 include/configs/apalis-tk1.h         | 1 -
 include/configs/apalis_imx6.h        | 1 -
 include/configs/apalis_t30.h         | 1 -
 include/configs/colibri-imx6ull.h    | 1 -
 include/configs/colibri_imx6.h       | 1 -
 include/configs/colibri_imx7.h       | 1 -
 include/configs/colibri_t20.h        | 1 -
 include/configs/colibri_t30.h        | 1 -
 include/configs/sandbox.h            | 1 -
 include/configs/xilinx_versal.h      | 1 -
 net/Kconfig                          | 7 +++++++
 scripts/config_whitelist.txt         | 1 -
 28 files changed, 23 insertions(+), 11 deletions(-)
configs/apalis-tk1_defconfig +1 -0
index be9d55e7d4..54031aa3b7 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
configs/apalis_imx6_defconfig +1 -0
index 3292d644aa..26cd36efc7 100644
@@ -53,6 +53,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
configs/apalis_t30_defconfig +1 -0
index 31a763536d..1a48c553b9 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
configs/colibri-imx6ull_defconfig +1 -0
index 3dbb4d95b6..9c92f49494 100644
@@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y
configs/colibri_imx6_defconfig +1 -0
index efb11ed987..1ebdb5dcbb 100644
@@ -53,6 +53,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
configs/colibri_imx7_defconfig +1 -0
index bfb84ecde8..8f9edf3b44 100644
@@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y
 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_FSL_CAAM=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y
configs/colibri_imx7_emmc_defconfig +1 -0
index 9312de9406..08da620c50 100644
@@ -40,6 +40,7 @@ CONFIG_OF_CONTROL=y
 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_FSL_CAAM=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
configs/colibri_t20_defconfig +1 -0
index 15fb9555f3..127523de9f 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_UBI=y
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
configs/colibri_t30_defconfig +1 -0
index 2d12fc10c4..326548e84a 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
configs/sandbox64_defconfig +1 -0
index 1bc3bd3801..bfb1eaf0e7 100644
@@ -74,6 +74,7 @@ CONFIG_OF_LIVE=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
configs/sandbox_defconfig +1 -0
index 4877f1099a..4cffa2c604 100644
@@ -79,6 +79,7 @@ CONFIG_OF_LIVE=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
configs/sandbox_flattree_defconfig +1 -0
index 40593ee3a1..dda6832f83 100644
@@ -59,6 +59,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
configs/sandbox_noblk_defconfig +1 -0
index 24ff4b41da..ec8726b798 100644
@@ -65,6 +65,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
configs/sandbox_spl_defconfig +1 -0
index bebd78d55b..3e0bf5d3b5 100644
@@ -76,6 +76,7 @@ CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
configs/tools-only_defconfig +1 -0
index fb06076785..aa73661a92 100644
@@ -9,6 +9,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
+CONFIG_IP_DEFRAG=y
 # CONFIG_UDP_FUNCTION_FASTBOOT is not set
 CONFIG_SANDBOX_GPIO=y
 CONFIG_DM_I2C_COMPAT=y
configs/xilinx_versal_virt_defconfig +1 -0
index b0b36a084f..9000573cda 100644
@@ -42,6 +42,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_OF_BOARD=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
include/configs/apalis-tk1.h +0 -1
index 9c8c8979f0..e43fd8fe5e 100644
@@ -31,7 +31,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/apalis_imx6.h +0 -1
index 9d9e16e5d9..f2cc898878 100644
@@ -59,7 +59,6 @@
 #define CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_ETHPRIME			"FEC"
 #define CONFIG_FEC_MXC_PHYADDR		6
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		4096
 #define CONFIG_TFTP_TSIZE
 
include/configs/apalis_t30.h +0 -1
index 77a5968cc2..c085be8b5f 100644
@@ -28,7 +28,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/colibri-imx6ull.h +0 -1
index fc39e807b6..aed22284e4 100644
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(32 * SZ_1M)
 
 /* Network */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/colibri_imx6.h +0 -1
index b540b3e074..44f63e6a2a 100644
@@ -50,7 +50,6 @@
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_ETHPRIME			"FEC"
 #define CONFIG_FEC_MXC_PHYADDR		1
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/colibri_imx7.h +0 -1
index c3b353b2c2..5b3817359a 100644
@@ -22,7 +22,6 @@
 #define CONFIG_ETHPRIME                 "FEC"
 #define CONFIG_FEC_MXC_PHYADDR          0
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/colibri_t20.h +0 -1
index 6c4e9d4154..dd9f7225a0 100644
@@ -18,7 +18,6 @@
 #define CONFIG_MACH_TYPE		MACH_TYPE_COLIBRI_TEGRA2
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		1536
 #define CONFIG_TFTP_TSIZE
 
include/configs/colibri_t30.h +0 -1
index 7ece00e646..a816ade310 100644
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		1
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
include/configs/sandbox.h +0 -1
index bf03baefe8..50affaf1a8 100644
@@ -71,7 +71,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
-#define CONFIG_IP_DEFRAG
 
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL
include/configs/xilinx_versal.h +0 -1
index 2cc36e793b..b2521df3db 100644
@@ -41,7 +41,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE	4096
 
 /* Miscellaneous configurable options */
net/Kconfig +7 -0
index f2363e5256..1a6fda9ebc 100644
@@ -22,4 +22,11 @@ config NETCONSOLE
 	  Support the 'nc' input/output device for networked console.
 	  See README.NetConsole for details.
 
+config IP_DEFRAG
+	bool "Support IP datagram reassembly"
+	default n
+	help
+	  Selecting this will enable IP datagram reassembly according
+	  to the algorithm in RFC815.
+
 endif   # if NET
scripts/config_whitelist.txt +0 -1
index 8651d569c5..8ec700f6ca 100644
@@ -927,7 +927,6 @@ CONFIG_IPAM390_GPIO_BOOTMODE
 CONFIG_IPAM390_GPIO_LED_GREEN
 CONFIG_IPAM390_GPIO_LED_RED
 CONFIG_IPROC
-CONFIG_IP_DEFRAG
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 net: Convert CONFIG_TFTP_BLOCKSIZE to Kconfig

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

Cc Christian Gmeiner <[email protected]>
Cc Joe Hershberger <[email protected]>
---
 configs/apalis-tk1_defconfig         | 1 +
 configs/apalis_imx6_defconfig        | 1 +
 configs/apalis_t30_defconfig         | 1 +
 configs/colibri-imx6ull_defconfig    | 1 +
 configs/colibri_imx6_defconfig       | 1 +
 configs/colibri_imx7_defconfig       | 1 +
 configs/colibri_imx7_emmc_defconfig  | 1 +
 configs/colibri_t20_defconfig        | 1 +
 configs/colibri_t30_defconfig        | 1 +
 configs/xilinx_versal_virt_defconfig | 1 +
 include/configs/apalis-tk1.h         | 1 -
 include/configs/apalis_imx6.h        | 1 -
 include/configs/apalis_t30.h         | 1 -
 include/configs/colibri-imx6ull.h    | 1 -
 include/configs/colibri_imx6.h       | 1 -
 include/configs/colibri_imx7.h       | 1 -
 include/configs/colibri_t20.h        | 1 -
 include/configs/colibri_t30.h        | 1 -
 include/configs/xilinx_versal.h      | 2 --
 net/Kconfig                          | 6 ++++++
 scripts/config_whitelist.txt         | 1 -
 21 files changed, 16 insertions(+), 11 deletions(-)
configs/apalis-tk1_defconfig +1 -0
index 54031aa3b7..820fc6e5f0 100644
@@ -31,6 +31,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
configs/apalis_imx6_defconfig +1 -0
index 26cd36efc7..248922cd56 100644
@@ -54,6 +54,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
configs/apalis_t30_defconfig +1 -0
index 1a48c553b9..9fde233220 100644
@@ -28,6 +28,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
configs/colibri-imx6ull_defconfig +1 -0
index 9c92f49494..1c027299b6 100644
@@ -46,6 +46,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
configs/colibri_imx6_defconfig +1 -0
index 1ebdb5dcbb..56e512d529 100644
@@ -54,6 +54,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
configs/colibri_imx7_defconfig +1 -0
index 8f9edf3b44..a689d886b7 100644
@@ -46,6 +46,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
configs/colibri_imx7_emmc_defconfig +1 -0
index 08da620c50..50d8de5f8b 100644
@@ -41,6 +41,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
configs/colibri_t20_defconfig +1 -0
index 127523de9f..ee2ccd0e04 100644
@@ -36,6 +36,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
configs/colibri_t30_defconfig +1 -0
index 326548e84a..04368d3e4e 100644
@@ -27,6 +27,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
configs/xilinx_versal_virt_defconfig +1 -0
index 9000573cda..3ce6c031ad 100644
@@ -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
include/configs/apalis-tk1.h +0 -1
index e43fd8fe5e..ec599d5332 100644
@@ -31,7 +31,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
 #undef CONFIG_IPADDR
include/configs/apalis_imx6.h +0 -1
index f2cc898878..348f08d1a6 100644
@@ -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 */
include/configs/apalis_t30.h +0 -1
index c085be8b5f..f6adfeb96a 100644
@@ -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 */
include/configs/colibri-imx6ull.h +0 -1
index aed22284e4..99540cc677 100644
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(32 * SZ_1M)
 
 /* Network */
-#define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
 /* ENET1 */
include/configs/colibri_imx6.h +0 -1
index 44f63e6a2a..4f68f744b5 100644
@@ -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 */
include/configs/colibri_imx7.h +0 -1
index 5b3817359a..3bd179149a 100644
@@ -22,7 +22,6 @@
 #define CONFIG_ETHPRIME                 "FEC"
 #define CONFIG_FEC_MXC_PHYADDR          0
 
-#define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
 /* ENET1 */
include/configs/colibri_t20.h +0 -1
index dd9f7225a0..cd7e168781 100644
@@ -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 */
include/configs/colibri_t30.h +0 -1
index a816ade310..8ff6433f45 100644
@@ -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 */
include/configs/xilinx_versal.h +0 -2
index b2521df3db..296f4502c6 100644
@@ -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
 
net/Kconfig +6 -0
index 1a6fda9ebc..68cecf75a2 100644
@@ -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
scripts/config_whitelist.txt +0 -1
index 8ec700f6ca..2a465d0d55 100644
@@ -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
Signature · 1 line
2.20.1
#3 lore raw

PATCH 2/2 net: Convert CONFIG_TFTP_BLOCKSIZE to Kconfig

In reply to Marek Vasut
Quoted 6 lines · Marek Vasut

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

Cc Christian Gmeiner <[email protected]>
Cc Joe Hershberger <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190615/ea1cae23/attachment.sig>
#4 lore raw

PATCH 1/2 net: Convert CONFIG_IP_DEFRAG to Kconfig

In reply to Marek Vasut
Quoted 8 lines · Marek Vasut

Convert CONFIG_IP_DEFRAG to Kconfig, update defconfigs, headers and whitelist. This patch is a follow-up on a patch by Christian Gmeiner with the added config/header/whitelist updates.

#5 lore raw

PATCH 1/2 net: Convert CONFIG_IP_DEFRAG to Kconfig

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut

Convert CONFIG_IP_DEFRAG to Kconfig, update defconfigs, headers and whitelist. This patch is a follow-up on a patch by Christian Gmeiner with the added config/header/whitelist updates.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190615/19b27083/attachment.sig>