leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Convert CONFIG_TFTP_BLOCKSIZE to Kconfig

Browse Source 
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>
This commit is contained in:
Marek Vasut 2019-06-11 04:51:15 +02:00 committed by Tom Rini
parent 3f6bcdf6a5
commit b618b37076
25 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/apalis-imx8qm_defconfig
View File

@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=4096
CONFIG_CLK_IMX8=y CONFIG_CLK_IMX8=y
CONFIG_CPU=y CONFIG_CPU=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/apalis-tk1_defconfig
View File

@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_OF_LIVE=y CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y

1
configs/apalis_imx6_defconfig
View File

@ -55,6 +55,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=4096
CONFIG_DWC_AHSATA=y CONFIG_DWC_AHSATA=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/apalis_t30_defconfig
View File

@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_OF_LIVE=y CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y

1
configs/colibri-imx6ull_defconfig
View File

@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DFU_NAND=y CONFIG_DFU_NAND=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/colibri-imx8qxp_defconfig
View File

@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=4096
CONFIG_CLK_IMX8=y CONFIG_CLK_IMX8=y
CONFIG_CPU=y CONFIG_CPU=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/colibri_imx6_defconfig
View File

@ -55,6 +55,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

1
configs/colibri_imx7_defconfig
View File

@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DFU_NAND=y CONFIG_DFU_NAND=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/colibri_imx7_emmc_defconfig
View File

@ -42,6 +42,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/colibri_t20_defconfig
View File

@ -37,6 +37,7 @@ CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri" CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=1536
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y

1
configs/colibri_t30_defconfig
View File

@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_OF_LIVE=y CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y

1
configs/xilinx_versal_virt_defconfig
View File

@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_OF_BOARD=y CONFIG_OF_BOARD=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_IP_DEFRAG=y CONFIG_IP_DEFRAG=y
CONFIG_TFTP_BLOCKSIZE=4096
CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

1
include/configs/apalis-imx8.h
View File

@ -29,7 +29,6 @@
/* Networking */ /* Networking */
#define FEC_QUIRK_ENET_MAC #define FEC_QUIRK_ENET_MAC
#define CONFIG_TFTP_BLOCKSIZE SZ_4K
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
#define CONFIG_IPADDR 192.168.10.2 #define CONFIG_IPADDR 192.168.10.2

1
include/configs/apalis-tk1.h
View File

@ -31,7 +31,6 @@
#define CONFIG_E1000_NO_NVM #define CONFIG_E1000_NO_NVM
/* General networking support */ /* General networking support */
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
#undef CONFIG_IPADDR #undef CONFIG_IPADDR

1
include/configs/apalis_imx6.h
View File

@ -59,7 +59,6 @@
#define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_ETHPRIME "FEC" #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 6 #define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_TFTP_BLOCKSIZE 4096
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* USB Configs */ /* USB Configs */

1
include/configs/apalis_t30.h
View File

@ -28,7 +28,6 @@
#define CONFIG_E1000_NO_NVM #define CONFIG_E1000_NO_NVM
/* General networking support */ /* General networking support */
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* Increase console I/O buffer size */ /* Increase console I/O buffer size */

1
include/configs/colibri-imx6ull.h
View File

@ -19,7 +19,6 @@
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
/* Network */ /* Network */
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* ENET1 */ /* ENET1 */

1
include/configs/colibri-imx8x.h
View File

@ -29,7 +29,6 @@
/* Networking */ /* Networking */
#define FEC_QUIRK_ENET_MAC #define FEC_QUIRK_ENET_MAC
#define CONFIG_TFTP_BLOCKSIZE SZ_4K
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
#define CONFIG_IPADDR 192.168.10.2 #define CONFIG_IPADDR 192.168.10.2

1
include/configs/colibri_imx6.h
View File

@ -50,7 +50,6 @@
#define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_ETHPRIME "FEC" #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 1 #define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* USB Configs */ /* USB Configs */

1
include/configs/colibri_imx7.h
View File

@ -22,7 +22,6 @@
#define CONFIG_ETHPRIME "FEC" #define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* ENET1 */ /* ENET1 */

1
include/configs/colibri_t20.h
View File

@ -18,7 +18,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
/* General networking support */ /* General networking support */
#define CONFIG_TFTP_BLOCKSIZE 1536
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* LCD support */ /* LCD support */

1
include/configs/colibri_t30.h
View File

@ -27,7 +27,6 @@
#define CONFIG_SYS_MMC_ENV_PART 1 #define CONFIG_SYS_MMC_ENV_PART 1
/* General networking support */ /* General networking support */
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* Increase console I/O buffer size */ /* Increase console I/O buffer size */

2
include/configs/xilinx_versal.h
View File

@ -41,8 +41,6 @@
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_MAY_FAIL #define CONFIG_BOOTP_MAY_FAIL
#define CONFIG_TFTP_BLOCKSIZE 4096
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR 0x8000000 #define CONFIG_SYS_LOAD_ADDR 0x8000000

6
net/Kconfig
View File

@ -29,4 +29,10 @@ config IP_DEFRAG
Selecting this will enable IP datagram reassembly according Selecting this will enable IP datagram reassembly according
to the algorithm in RFC815. to the algorithm in RFC815.
config TFTP_BLOCKSIZE
int "TFTP block size"
default 512
help
Default TFTP block size.
endif # if NET endif # if NET

1
scripts/config_whitelist.txt
View File

@ -4250,7 +4250,6 @@ CONFIG_TESTPIN_MASK
CONFIG_TESTPIN_REG CONFIG_TESTPIN_REG
CONFIG_TEST_LIST_SORT CONFIG_TEST_LIST_SORT
CONFIG_TFP410_I2C_ADDR CONFIG_TFP410_I2C_ADDR
CONFIG_TFTP_BLOCKSIZE
CONFIG_TFTP_FILE_NAME_MAX_LEN CONFIG_TFTP_FILE_NAME_MAX_LEN
CONFIG_TFTP_PORT CONFIG_TFTP_PORT
CONFIG_TFTP_TSIZE CONFIG_TFTP_TSIZE