Before this patch, bootp would not overwrite the value, but the value was still clobbered in the env
Signed-off-by: Joe Hershberger <joe.hershber...@ni.com> Cc: Joe Hershberger <joe.hershber...@gmail.com> --- Changes for v2: - Added a comment Changes for v3: - Rebased onto other changed patches - Fixed comment style common/cmd_net.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/cmd_net.c b/common/cmd_net.c index 65f32bc..2f66056 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -153,12 +153,16 @@ static void netboot_update_env (void) ip_to_string (NetOurIP, tmp); setenv ("ipaddr", tmp); } - +#if !defined(CONFIG_BOOTP_SERVERIP) + /* + * Only attempt to change serverip if net/bootp.c:BootpCopyNetParams() + * could have set it + */ if (NetServerIP) { ip_to_string (NetServerIP, tmp); setenv ("serverip", tmp); } - +#endif if (NetOurDNSIP) { ip_to_string (NetOurDNSIP, tmp); setenv ("dnsip", tmp); -- 1.6.0.2 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot