| Message ID | 20211022134725.26004-5-kabel@kernel.org |
|---|---|
| State | Accepted |
| Commit | 07dcd82546ea1b1e3bbb139254d7ac3f531a1caf |
| 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_nand_init() says the environment is valid even if it is assigning > default environment due to not being able to access nand pre-reloaction > (determined by macro values). Change this to ENV_INVALID and let the > generic env_init() function, which calls this initializer, assign the > default environment. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > --- > env/nand.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_nand_init() says the environment is valid even if it is assigning > default environment due to not being able to access nand pre-reloaction > (determined by macro values). Change this to ENV_INVALID and let the > generic env_init() function, which calls this initializer, assign the > default environment. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > --- > env/nand.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/nand.c b/env/nand.c index be82e97d69..21aa367d5b 100644 --- a/env/nand.c +++ b/env/nand.c @@ -107,8 +107,7 @@ static int env_nand_init(void) gd->env_addr = (ulong)env_ptr->data; #else /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */ - gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = ENV_VALID; + gd->env_valid = ENV_INVALID; #endif /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */ return 0;