net: Fix error if some network features are disabled
Krebs
PATCH 1/1 net: Fix error if some network features are disabled
If 'CONFIG_CMD_TFTPBOOT' or 'CONFIG_CMD_BOOTP' are disabled, the usage must be disabled, too!
Signed-off-by Olaf Krebs <[email protected]>
CC Joe Hershberger <[email protected]>
--- cmd/net.c | 6 ++++++ net/net.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
cmd/net.c +6 -0
@@ -129,11 +129,15 @@ static void netboot_update_env(void)env_set ("netmask" , tmp); } +#ifdef CONFIG_CMD_BOOTP if (net_hostname[0 ])env_set ("hostname" , net_hostname); +#endif +#ifdef CONFIG_CMD_BOOTP if (net_root_path[0 ])env_set ("rootpath" , net_root_path); +#endif if (net_ip.s_addr) {ip_to_string (net_ip, tmp);
@@ -159,8 +163,10 @@ static void netboot_update_env(void)env_set ("dnsip2" , tmp); }#endif +#ifdef CONFIG_CMD_BOOTP if (net_nis_domain[0 ])env_set ("domain" , net_nis_domain); +#endif #if defined(CONFIG_CMD_SNTP ) && defined(CONFIG_BOOTP_TIMEOFFSET )if (net_ntp_time_offset) {
net/net.c +4 -2
@@ -454,6 +454,7 @@ restart: net_dev_exists =1 ; net_boot_file_size =0 ;switch (protocol) { +#ifdef CONFIG_CMD_TFTPBOOT case TFTPGET :#ifdef CONFIG_CMD_TFTPPUT case TFTPPUT :
@@ -461,6 +462,7 @@ restart:/* always use ARP to get server ethernet address */ tftp_start (protocol);break ; +#endif #ifdef CONFIG_CMD_TFTPSRV case TFTPSRV :tftp_start_server ();
@@ -478,13 +480,13 @@ restart:dhcp_request ();/* Basically same as BOOTP */ break ;#endif - +#if defined(CONFIG_CMD_BOOTP )case BOOTP :bootp_reset (); net_ip.s_addr =0 ;bootp_request ();break ; - +#endif #if defined(CONFIG_CMD_RARP )case RARP : rarp_try =0 ;
Signature · 1 line
2.20.1
PATCH 1/1 net: Fix error if some network features are disabled
Quoted 4 lines · Olaf
If '
CONFIG_CMD_TFTPBOOT' or 'CONFIG_CMD_BOOTP' are disabled, the usage must be disabled, too!Signed-off-by Olaf Krebs <[email protected]>CC Joe Hershberger <[email protected]>
Applied to u-boot/next, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200612/70f14715/attachment.sig>