Merge branch 'master' of git://git.denx.de/u-boot-sh

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

diff --git a/net/Kconfig b/net/Kconfig
index c393269f270b58b84e1a8369a1c673978ff2a7f3..68cecf75a2c5643f9bea8dc48da5bb8360e526a6 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,12 +4,12 @@
 
 menuconfig NET
        bool "Networking support"
 
 menuconfig NET
        bool "Networking support"

+       default y

 
 if NET
 
 config NET_RANDOM_ETHADDR
        bool "Random ethaddr if unset"
 
 if NET
 
 config NET_RANDOM_ETHADDR
        bool "Random ethaddr if unset"

-       select LIB_RAND

        help
          Selecting this will allow the Ethernet interface to function
          even when the ethaddr variable for that interface is unset.
        help
          Selecting this will allow the Ethernet interface to function
          even when the ethaddr variable for that interface is unset.


@@ -22,30 +22,17 @@ config NETCONSOLE
          Support the 'nc' input/output device for networked console.
          See README.NetConsole for details.
 
          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"
-       default y
+config IP_DEFRAG
+       bool "Support IP datagram reassembly"
+       default n

        help
        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_PXE_CLIENTARCH
-       hex
-        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 BOOTP_VCI_STRING
-       string
-       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 SPL_NET_VCI_STRING
-       string
+config TFTP_BLOCKSIZE
+       int "TFTP block size"
+       default 512
+       help
+         Default TFTP block size.

 
 endif   # if NET
 
 endif   # if NET