Merge tag 'xilinx-for-v2018.05-rc2' of git://git.denx.de/u-boot-microblaze

[u-boot] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 414c5497c7584ea78dfd4696c4c6b42c3640292b..143c4416cddde25128f5beef73ededdf7d522374 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,12 +4,12 @@
 
 menuconfig NET
        bool "Networking support"
+       default y
 
 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.
@@ -24,6 +24,7 @@ config NETCONSOLE
 
 config NET_TFTP_VARS
        bool "Control TFTP timeout and count through environment"
+       depends on CMD_NET
        default y
        help
          If set, allows controlling the TFTP timeout through the
@@ -32,14 +33,41 @@ config NET_TFTP_VARS
          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
 
 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