[U-Boot] [PATCH 19/28] net: Don't write the "serverip" env var if told not to in the config

[Joe Hershberger]

Before this patch, bootp would not overwrite the value, but the
   value was still clobbered in the env

Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
Cc: Joe Hershberger <joe.hershberger at gmail.com>
Cc: Wolfgang Denk <wd at denx.de>
---
 common/cmd_net.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 89519fa..49ef680 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -148,12 +148,12 @@ static void netboot_update_env (void)
 		ip_to_string (NetOurIP, tmp);
 		setenv ("ipaddr", tmp);
 	}
-
+#if !defined(CONFIG_BOOTP_SERVERIP)
 	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