summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-10-22 15:47:16 +0200
committerSimon Glass <sjg@chromium.org>2021-10-31 12:26:44 -0600
commit4735de4ffce0d3698222f31206bc82120c07a52e (patch)
tree09853e5a934ac3efa2638f0e8723ec4f63846857 /env
parent07dcd82546ea1b1e3bbb139254d7ac3f531a1caf (diff)
downloadu-boot-4735de4ffce0d3698222f31206bc82120c07a52e.tar.gz
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>
Diffstat (limited to 'env')
-rw-r--r--env/nvram.c3
1 files changed, 1 insertions, 2 deletions
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;