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

Marek Behún kabel at kernel.org
Fri Oct 22 15:47:14 CEST 2021


From: Marek Behún <marek.behun at 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 at nic.cz>
---
 env/sf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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



More information about the U-Boot mailing list