Browse Source

net: Make the BOOTP options default

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@ni.com>

Reviewed-by: Duncan Hare <dh@synoia.com>
Joe Hershberger 7 years ago
parent
commit
3dfbc53bd6
2 changed files with 6 additions and 6 deletions
  1. 0 6
      Kconfig
  2. 6 0
      cmd/Kconfig

+ 0 - 6
Kconfig

@@ -79,12 +79,6 @@ config DISTRO_DEFAULTS
 	imply CMD_MII if NET
 	imply CMD_MII if NET
 	select CMD_PART if PARTITIONS
 	select CMD_PART if PARTITIONS
 	select HUSH_PARSER
 	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 CMDLINE_EDITING
 	select AUTO_COMPLETE
 	select AUTO_COMPLETE
 	select SYS_LONGHELP
 	select SYS_LONGHELP

+ 6 - 0
cmd/Kconfig

@@ -1043,6 +1043,7 @@ config CMD_DHCP
 
 
 config BOOTP_BOOTPATH
 config BOOTP_BOOTPATH
 	bool "Request & store 'rootpath' from BOOTP/DHCP server"
 	bool "Request & store 'rootpath' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	depends on CMD_BOOTP
 	help
 	help
 	  Even though the config is called BOOTP_BOOTPATH, it stores the
 	  Even though the config is called BOOTP_BOOTPATH, it stores the
@@ -1050,6 +1051,7 @@ config BOOTP_BOOTPATH
 
 
 config BOOTP_DNS
 config BOOTP_DNS
 	bool "Request & store 'dnsip' from BOOTP/DHCP server"
 	bool "Request & store 'dnsip' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	depends on CMD_BOOTP
 	help
 	help
 	  The primary DNS server is stored as 'dnsip'. If two servers are
 	  The primary DNS server is stored as 'dnsip'. If two servers are
@@ -1069,20 +1071,24 @@ config BOOTP_DNS2
 
 
 config BOOTP_GATEWAY
 config BOOTP_GATEWAY
 	bool "Request & store 'gatewayip' from BOOTP/DHCP server"
 	bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	depends on CMD_BOOTP
 
 
 config BOOTP_HOSTNAME
 config BOOTP_HOSTNAME
 	bool "Request & store 'hostname' from BOOTP/DHCP server"
 	bool "Request & store 'hostname' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	depends on CMD_BOOTP
 	help
 	help
 	  The name may or may not be qualified with the local domain name.
 	  The name may or may not be qualified with the local domain name.
 
 
 config BOOTP_SUBNETMASK
 config BOOTP_SUBNETMASK
 	bool "Request & store 'netmask' from BOOTP/DHCP server"
 	bool "Request & store 'netmask' from BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP
 	depends on CMD_BOOTP
 
 
 config BOOTP_PXE
 config BOOTP_PXE
 	bool "Send PXE client arch to BOOTP/DHCP server"
 	bool "Send PXE client arch to BOOTP/DHCP server"
+	default y
 	depends on CMD_BOOTP && CMD_PXE
 	depends on CMD_BOOTP && CMD_PXE
 	help
 	help
 	  Supported for ARM, ARM64, and x86 for now.
 	  Supported for ARM, ARM64, and x86 for now.