[U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default

[Joe Hershberger]

The BOOTP options used to be and should still be default for all boards
with CMD_NET enabled. One should not be forced to use DISTRO_DEFAULTS to
get them.

Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>

Reviewed-by: Duncan Hare <dh at synoia.com>
---

Changes in v2: None

 Kconfig     | 6 ------
 cmd/Kconfig | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Kconfig b/Kconfig
index f319750..0b73006 100644
--- a/Kconfig
+++ b/Kconfig
@@ -79,12 +79,6 @@ config DISTRO_DEFAULTS
 	imply CMD_MII if NET
 	select CMD_PART if PARTITIONS
 	select HUSH_PARSER
-	select BOOTP_BOOTPATH if NET && CMD_NET
-	select BOOTP_DNS if NET && CMD_NET
-	select BOOTP_GATEWAY if NET && CMD_NET
-	select BOOTP_HOSTNAME if NET && CMD_NET
-	select BOOTP_PXE if NET && CMD_NET
-	select BOOTP_SUBNETMASK if NET && CMD_NET
 	select CMDLINE_EDITING
 	select AUTO_COMPLETE
 	select SYS_LONGHELP
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0d077bd..bc1d2f3 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1043,6 +1043,7 @@ config CMD_DHCP
 
 config BOOTP_BOOTPATH
 	bool "Request & store 'rootpath' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	help
 	  Even though the config is called BOOTP_BOOTPATH, it stores the
@@ -1050,6 +1051,7 @@ config BOOTP_BOOTPATH
 
 config BOOTP_DNS
 	bool "Request & store 'dnsip' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	help
 	  The primary DNS server is stored as 'dnsip'. If two servers are
@@ -1069,20 +1071,24 @@ config BOOTP_DNS2
 
 config BOOTP_GATEWAY
 	bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 
 config BOOTP_HOSTNAME
 	bool "Request & store 'hostname' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	help
 	  The name may or may not be qualified with the local domain name.
 
 config BOOTP_SUBNETMASK
 	bool "Request & store 'netmask' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 
 config BOOTP_PXE
 	bool "Send PXE client arch to BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP && CMD_PXE
 	help
 	  Supported for ARM, ARM64, and x86 for now.
-- 
1.7.11.5