leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Drop #ifdefs with CONFIG_BOOTP_SERVERIP

Browse Source 
Use IS_ENABLED() instead, to reduce the number of build paths.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Simon Glass 2021-12-18 11:27:52 -07:00 committed by Tom Rini
parent d3877fba31
commit 434075393d
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/net.c
View File

@ -152,16 +152,14 @@ static void netboot_update_env(void)
ip_to_string(net_ip, tmp);
env_set("ipaddr", tmp);
}
#if !defined(CONFIG_BOOTP_SERVERIP)
/*
* Only attempt to change serverip if net/bootp.c:store_net_params()
* could have set it
*/
if (net_server_ip.s_addr) {
if (!IS_ENABLED(CONFIG_BOOTP_SERVERIP) && net_server_ip.s_addr) {
ip_to_string(net_server_ip, tmp);
env_set("serverip", tmp);
}
#endif
if (net_dns_server.s_addr) {
ip_to_string(net_dns_server, tmp);
env_set("dnsip", tmp);

5
net/bootp.c
View File

@ -148,10 +148,12 @@ static int check_reply_packet(uchar *pkt, unsigned dest, unsigned src,
static void store_bootp_params(struct bootp_hdr *bp)
{
#if !defined(CONFIG_BOOTP_SERVERIP)
struct in_addr tmp_ip;
bool overwrite_serverip = true;
if (IS_ENABLED(CONFIG_BOOTP_SERVERIP))
return;
#if defined(CONFIG_BOOTP_PREFER_SERVERIP)
overwrite_serverip = false;
#endif
@ -179,7 +181,6 @@ static void store_bootp_params(struct bootp_hdr *bp)
*/
if (*net_boot_file_name)
env_set("bootfile", net_boot_file_name);
#endif
}
/*

24
net/net.c
View File

@ -302,12 +302,12 @@ void net_auto_load(void)
if (s != NULL && strcmp(s, "NFS") == 0) {
if (net_check_prereq(NFS)) {
/* We aren't expecting to get a serverip, so just accept the assigned IP */
#ifdef CONFIG_BOOTP_SERVERIP
net_set_state(NETLOOP_SUCCESS);
#else
printf("Cannot autoload with NFS\n");
net_set_state(NETLOOP_FAIL);
#endif
if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) {
net_set_state(NETLOOP_SUCCESS);
} else {
printf("Cannot autoload with NFS\n");
net_set_state(NETLOOP_FAIL);
}
return;
}
/*
@ -327,12 +327,12 @@ void net_auto_load(void)
}
if (net_check_prereq(TFTPGET)) {
/* We aren't expecting to get a serverip, so just accept the assigned IP */
#ifdef CONFIG_BOOTP_SERVERIP
net_set_state(NETLOOP_SUCCESS);
#else
printf("Cannot autoload with TFTPGET\n");
net_set_state(NETLOOP_FAIL);
#endif
if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) {
net_set_state(NETLOOP_SUCCESS);
} else {
printf("Cannot autoload with TFTPGET\n");
net_set_state(NETLOOP_FAIL);
}
return;
}
tftp_start(TFTPGET);