commit 6d7653cc8b172f72698d3503dee8947ccaf03f63
author Marek Behún <marek.behun@nic.cz> Fri Oct 22 15:47:16 2021 +0200
committer Simon Glass <sjg@chromium.org> Sun Oct 31 12:26:44 2021 -0600
tree 09853e5a934ac3efa2638f0e8723ec4f63846857
parent 385518c698384daaa9e1a6ed06de49fe0940b9a7

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>

env/nvram.c

diff --git a/env/nvram.c b/env/nvram.c
index 261b31e..297573c 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -94,8 +94,7 @@
 #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;