diff options
| author | Krebs, Olaf | 2020-03-09 14:27:55 +0000 |
|---|---|---|
| committer | Tom Rini | 2020-06-12 13:17:23 -0400 |
| commit | 808f13d8fc38959dc90de7243029141e758a5c0a (patch) | |
| tree | 07a17db6b106875a0e031d637b3d33ec913562ee | |
| parent | f3767bcb31d0ce5c6381d5f6c33a951774ee6d41 (diff) | |
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 <olaf.krebs@emh-metering.com>
CC: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | cmd/net.c | 6 | ||||
| -rw-r--r-- | net/net.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cmd/net.c b/cmd/net.c index 25390b0474f..9bbcdbcfe07 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -135,11 +135,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); @@ -165,8 +169,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) { diff --git a/net/net.c b/net/net.c index 37932919d04..11683dd6d09 100644 --- a/net/net.c +++ b/net/net.c @@ -456,6 +456,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: @@ -463,6 +464,7 @@ restart: /* always use ARP to get server ethernet address */ tftp_start(protocol); break; +#endif #ifdef CONFIG_CMD_TFTPSRV case TFTPSRV: tftp_start_server(); @@ -480,13 +482,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; |