From: Tom Rini <trini@konsulko.com>
Date: Fri, 6 Dec 2019 00:35:07 +0000 (-0500)
Subject: net: nfs: Only link in NFS code outside of SPL builds
X-Git-Tag: v2020.01-rc5~8^2~56
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6ab4b5470afadbc0f2a3d70437e3ccb88d8fa5c;p=oweals%2Fu-boot.git

net: nfs: Only link in NFS code outside of SPL builds

While we have networking use cases within SPL we do not support loading
files via NFS at this point in time.  Disable calling nfs_start() so
that the NFS related code can be garbage collected at link time.

Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/net/net.c b/net/net.c
index 284ae1bd6b..5114364edd 100644
--- a/net/net.c
+++ b/net/net.c
@@ -308,7 +308,7 @@ U_BOOT_ENV_CALLBACK(dnsip, on_dnsip);
  */
 void net_auto_load(void)
 {
-#if defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_SPL_BUILD)
 	const char *s = env_get("autoload");
 
 	if (s != NULL && strcmp(s, "NFS") == 0) {
@@ -496,7 +496,7 @@ restart:
 			ping_start();
 			break;
 #endif
-#if defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_SPL_BUILD)
 		case NFS:
 			nfs_start();
 			break;