| Message ID | 20211022134725.26004-6-kabel@kernel.org |
|---|---|
| State | Accepted |
| Commit | 4735de4ffce0d3698222f31206bc82120c07a52e |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | Some more env fixes | expand |
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote: > > From: Marek Behún <marek.behun@nic.cz> > > 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> > --- > env/nvram.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote: > > From: Marek Behún <marek.behun@nic.cz> > > 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> > --- > env/nvram.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
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;