diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-12 14:58:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-12 14:58:12 -0400 |
| commit | 8a1292ce3e21205645a155b23ac083a3fc6b64c1 (patch) | |
| tree | 48fcd8954ca5d99a1b0e834d24031fbc353bf762 /cmd/net.c | |
| parent | d16b38f42704fe3cc94fbee1601be96045013151 (diff) | |
| parent | f1d925d9c39628d346b3809408695cd5c8b8faa2 (diff) | |
Merge branch '2020-06-12-next-net' into next
- Merge tbs2910 distro boot support and associated clean-ups and size
reduction.
- Assorted networking corrections / bugfixes.
- Drop smc911x standalone API example as it was likely non-functional for a
long time.
- Enhanced support for TI PHYs
- rtl8139 DM conversion
Diffstat (limited to 'cmd/net.c')
| -rw-r--r-- | cmd/net.c | 6 |
1 files changed, 6 insertions, 0 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) { |