From: Marek Behún <marek.behun@nic.cz>
Date: Fri, 22 Oct 2021 13:47:14 +0000 (+0200)
Subject: env: sf: Put ENV_INVALID into gd->env_valid on CRC failure
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=af8149e9ac40dbb596fb2f5b72b82feb54476f68;p=u-boot.git

env: sf: Put ENV_INVALID into gd->env_valid on CRC failure

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

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;