diff options
| author | Simon Glass | 2021-12-18 11:27:48 -0700 |
|---|---|---|
| committer | Tom Rini | 2022-01-21 14:01:34 -0500 |
| commit | 3df6cd4d63678065ce82637d995ed3170e9e56cd (patch) | |
| tree | e63d441b26732f0acf9294aa9421587105321e9f | |
| parent | 2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2 (diff) | |
Convert CONFIG_KEEP_SERVERADDR to Kconfig
This converts the following to Kconfig:
CONFIG_KEEP_SERVERADDR
Drop the preprocessor usage also.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 1 | ||||
| -rw-r--r-- | net/Kconfig | 9 | ||||
| -rw-r--r-- | net/arp.c | 5 |
4 files changed, 11 insertions, 9 deletions
@@ -1138,11 +1138,6 @@ The following options need to be configured: server to contact when using the "tftboot" command. (Environment variable "serverip") - CONFIG_KEEP_SERVERADDR - - Keeps the server's MAC address, in the env 'serveraddr' - for passing to bootargs (like Linux's netconsole option) - - Gateway IP address: CONFIG_GATEWAYIP diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index cd7d99ec69c..1dd21d5e925 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM #define CONFIG_TIMESTAMP #define CONFIG_BOOTP_SERVERIP diff --git a/net/Kconfig b/net/Kconfig index cabe93c6bd2..8e9579afb2b 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -99,4 +99,13 @@ config SERVERIP_FROM_PROXYDHCP_DELAY_MS receiving response from main DHCP server. Has no effect if SERVERIP_FROM_PROXYDHCP is false. +config KEEP_SERVERADDR + bool "Write the server's MAC address to 'serveraddr'" + default y if SANDBOX + help + Keeps the server's MAC address, in the env 'serveraddr' + for passing to bootargs (like Linux's netconsole option). If this is + enabled, when an ARP reply is received, the server's IP address is + written there. + endif # if NET diff --git a/net/arp.c b/net/arp.c index 1d06ed25722..0b086dc8d21 100644 --- a/net/arp.c +++ b/net/arp.c @@ -196,13 +196,12 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) if (!arp_is_waiting()) break; -#ifdef CONFIG_KEEP_SERVERADDR - if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { + if (IS_ENABLED(CONFIG_KEEP_SERVERADDR) && + net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { char buf[20]; sprintf(buf, "%pM", &arp->ar_sha); env_set("serveraddr", buf); } -#endif reply_ip_addr = net_read_ip(&arp->ar_spa); |