diff mbox series

[03/14] env: sf: Put ENV_INVALID into gd->env_valid on CRC failure

Message ID 20211022134725.26004-4-kabel@kernel.org
State Accepted
Commit af8149e9ac40dbb596fb2f5b72b82feb54476f68
Delegated to: Simon Glass
Headers show
Series Some more env fixes | expand

Commit Message

Marek Behún Oct. 22, 2021, 1:47 p.m. UTC 
From: Marek Behún <marek.behun@nic.cz>

env_sf_init_addr() says the environment is valid even if it is assigning
default environment due to CRC failure. 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/sf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Simon Glass Oct. 22, 2021, 4:08 p.m. UTC | #1 
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> env_sf_init_addr() says the environment is valid even if it is assigning
> default environment due to CRC failure. 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/sf.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/env/sf.c b/env/sf.c
index c251d076d7..6a4bb756f0 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -341,8 +341,7 @@  static int env_sf_init_addr(void)
 		gd->env_addr = (ulong)&(env_ptr->data);
 		gd->env_valid = ENV_VALID;
 	} else {
-		gd->env_addr = (ulong)&default_environment[0];
-		gd->env_valid = ENV_VALID;
+		gd->env_valid = ENV_INVALID;
 	}
 
 	return 0;