From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 17 Jan 2026 00:24:42 +0000 (+0000)
Subject: net: lwip: nfs: Prefer nfsserverip over serverip when set
X-Git-Tag: v2026.04-rc2~23^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3349e3aa1b0da2d5e5200d4417cf4d57ff5d5e66;p=thirdparty%2Fu-boot.git

net: lwip: nfs: Prefer nfsserverip over serverip when set

Prefer use of a 'nfsserverip' env var before falling back to 'serverip'
when using the nfs command. Similar to how the 'tftpserverip' env var
is preferred over 'serverip' by the tftp command.

This also updates the error message to closer match the error message
used by the lwIP tftp command when a server ip is not set.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Jerome Forissier <jerome.forissier@arm.com>
---

diff --git a/net/lwip/nfs.c b/net/lwip/nfs.c
index 1812bbda68e..c3b819a091e 100644
--- a/net/lwip/nfs.c
+++ b/net/lwip/nfs.c
@@ -247,10 +247,12 @@ int do_nfs(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 		}
 	}
 
+	if (!server_ip)
+		server_ip = env_get("nfsserverip");
 	if (!server_ip)
 		server_ip = env_get("serverip");
 	if (!server_ip) {
-		log_err("*** ERROR: 'serverip' not set\n");
+		log_err("error: nfsserverip/serverip not set\n");
 		ret = CMD_RET_FAILURE;
 		goto out;
 	}