| Message ID | 20191206003507.22319-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | a6ab4b5470afadbc0f2a3d70437e3ccb88d8fa5c |
| Delegated to: | Joe Hershberger |
| Headers | show |
| Series | net: nfs: Only link in NFS code outside of SPL builds | expand |
On Thu, Dec 5, 2019 at 6:36 PM Tom Rini <trini@konsulko.com> wrote: > > 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. > > Cc: Joe Hershberger <joe.hershberger@ni.com> > 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 0513444eb78f..9b6f80dc9a03 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;
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. Cc: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- net/net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)