Merge tag 'dm-pull-7jul19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[oweals/u-boot.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index d421a34d979647c55c5c82ea2414a63ba07493ab..68cecf75a2c5643f9bea8dc48da5bb8360e526a6 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -22,54 +22,17 @@ config NETCONSOLE
          Support the 'nc' input/output device for networked console.
          See README.NetConsole for details.
 
-config NET_TFTP_VARS
-       bool "Control TFTP timeout and count through environment"
-       depends on CMD_TFTPBOOT
-       default y
+config IP_DEFRAG
+       bool "Support IP datagram reassembly"
+       default n
        help
-         If set, allows controlling the TFTP timeout through the
-         environment variable tftptimeout, and the TFTP maximum
-         timeout count through the variable tftptimeoutcountmax.
-         If unset, timeout and maximum are hard-defined as 1 second
-         and 10 timouts per TFTP transfer.
-
-config BOOTP_BOOTPATH
-       bool "Enable BOOTP BOOTPATH"
-       depends on CMD_BOOTP
-
-config BOOTP_DNS
-       bool "Enable bootp DNS"
-       depends on CMD_BOOTP
-
-config BOOTP_GATEWAY
-       bool "Enable BOOTP gateway"
-       depends on CMD_BOOTP
-
-config BOOTP_HOSTNAME
-       bool "Enable BOOTP hostname"
-       depends on CMD_BOOTP
+         Selecting this will enable IP datagram reassembly according
+         to the algorithm in RFC815.
 
-config BOOTP_PXE
-       bool "Enable BOOTP PXE"
-       depends on CMD_BOOTP
-
-config BOOTP_SUBNETMASK
-       bool "Enable BOOTP subnetmask"
-       depends on CMD_BOOTP
-
-config BOOTP_PXE_CLIENTARCH
-       hex
-       depends on CMD_BOOTP
-        default 0x16 if ARM64
-        default 0x15 if ARM
-        default 0 if X86
-
-config BOOTP_VCI_STRING
-       string
-       depends on CMD_BOOTP
-       default "U-Boot.armv7" if CPU_V7 || CPU_V7M
-       default "U-Boot.armv8" if ARM64
-       default "U-Boot.arm" if ARM
-       default "U-Boot"
+config TFTP_BLOCKSIZE
+       int "TFTP block size"
+       default 512
+       help
+         Default TFTP block size.
 
 endif   # if NET