From: Marek Behún <marek.behun@nic.cz>
Date: Fri, 22 Oct 2021 13:47:16 +0000 (+0200)
Subject: env: nvram: Let generic env_init() assign default environment
X-Git-Tag: v2025.01-rc5-pxa1908~1657^2~11
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=4735de4ffce0d3698222f31206bc82120c07a52e;p=u-boot.git

env: nvram: Let generic env_init() assign default environment

env_nvram_init() assigns default environment if ENV_INVALID, but this is
done in the generic env_init() function, which calls this initializer,
so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/env/nvram.c b/env/nvram.c
index 261b31edfb..297573c4ed 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -94,8 +94,7 @@ static int env_nvram_init(void)
 #endif
 		gd->env_valid = ENV_VALID;
 	} else {
-		gd->env_addr	= (ulong)&default_environment[0];
-		gd->env_valid	= ENV_INVALID;
+		gd->env_valid = ENV_INVALID;
 	}
 
 	return 0;