colibri_imx6: fix video stdout in default environment

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

diff --git a/net/Kconfig b/net/Kconfig
index 143c4416cddde25128f5beef73ededdf7d522374..ac6d0cf8a6fc51fd61386f46a854face43f31b71 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -22,55 +22,31 @@ 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_NET
-       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_NET
-
-config BOOTP_DNS
-       bool "Enable bootp DNS"
-       depends on CMD_NET
-
-config BOOTP_GATEWAY
-       bool "Enable BOOTP gateway"
-       depends on CMD_NET
-
-config BOOTP_HOSTNAME
-       bool "Enable BOOTP hostname"
-       depends on CMD_NET
-
-config BOOTP_PXE
-       bool "Enable BOOTP PXE"
-       depends on CMD_NET
-
-config BOOTP_SUBNETMASK
-       bool "Enable BOOTP subnetmask"
-       depends on CMD_NET
-       depends on CMD_NET
-
-config BOOTP_PXE_CLIENTARCH
-       hex
-       depends on CMD_NET
-        default 0x16 if ARM64
-        default 0x15 if ARM
-        default 0 if X86
+         Selecting this will enable IP datagram reassembly according
+         to the algorithm in RFC815.
+
+config NET_MAXDEFRAG
+       int "Size of buffer used for IP datagram reassembly"
+       depends on IP_DEFRAG
+       default 16384
+       range 1024 65536
+       help
+         This defines the size of the statically allocated buffer
+         used for reassembly, and thus an upper bound for the size of
+         IP datagrams that can be received.
 
-config BOOTP_VCI_STRING
-       string
-       depends on CMD_NET
-       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 1468
+       help
+         Default TFTP block size.
+         The MTU is typically 1500 for ethernet, so a TFTP block of
+         1468 (MTU minus eth.hdrs) provides a good throughput with
+         almost-MTU block sizes.
+         You can also activate CONFIG_IP_DEFRAG to set a larger block.
 
 endif   # if NET