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>
This commit is contained in:
Marek Behún 2021-10-22 15:47:16 +02:00 committed by Simon Glass
parent 07dcd82546
commit 4735de4ffc

3
env/nvram.c vendored
View file

@ -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;