浏览代码

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 年之前
父节点
当前提交
3dfbc53bd6
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 0 6
      Kconfig
  2. 6 0
      cmd/Kconfig

+ 0 - 6
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

+ 6 - 0
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.