From df4c0fd695c6e37a2dae338e6c61e62090e423f0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 31 May 2025 11:28:51 +0100 Subject: [PATCH] net: Combine options which depend on CMD_BOOTP It is a little confusing that we have CMD_BOOTP as an option but it has a very different purpose to similarly named options like CMD_BOOTM and CMD_BOOTZ. Reduce the number of occurences in Kconfig by bracketing some of the options which depend on it with 'if...endif' Signed-off-by: Simon Glass --- cmd/Kconfig | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 86f54498ab8..0d22a49cb64 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1872,9 +1872,10 @@ config DHCP6_ENTERPRISE_ID endif +if CMD_BOOTP + config BOOTP_MAY_FAIL bool "Allow for the BOOTP/DHCP server to not be found" - depends on CMD_BOOTP help If the DHCP server is not found after the configured retry count, the call will fail instead of starting over. This can be used to fail @@ -1884,23 +1885,19 @@ config BOOTP_MAY_FAIL 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 path in the variable 'rootpath'. config BOOTP_VENDOREX bool "Support vendor extensions from BOOTP/DHCP server" - depends on CMD_BOOTP config BOOTP_BOOTFILESIZE bool "Request & store 'bootfilesize' from BOOTP/DHCP server" - depends on CMD_BOOTP 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 returned, you must set BOOTP_DNS2 to store that second server IP @@ -1920,18 +1917,15 @@ 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_PREFER_SERVERIP bool "serverip variable takes precedent over DHCP server IP." - depends on CMD_BOOTP help By default a BOOTP/DHCP reply will overwrite the 'serverip' variable. @@ -1942,19 +1936,18 @@ config BOOTP_PREFER_SERVERIP config BOOTP_SUBNETMASK bool "Request & store 'netmask' from BOOTP/DHCP server" default y - depends on CMD_BOOTP config BOOTP_NISDOMAIN bool "Request & store 'nisdomain' from BOOTP/DHCP server" - depends on CMD_BOOTP config BOOTP_NTPSERVER bool "Request & store 'ntpserverip' from BOOTP/DHCP server" - depends on CMD_BOOTP config BOOTP_TIMEOFFSET bool "Request & store 'timeoffset' from BOOTP/DHCP server" - depends on CMD_BOOTP && CMD_SNTP + depends on CMD_SNTP + +endif # CMD_BOOTP config CMD_PCAP bool "pcap capture"