aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-10-22 15:47:14 +0200
committerSimon Glass <sjg@chromium.org>2021-10-31 12:26:44 -0600
commitaf8149e9ac40dbb596fb2f5b72b82feb54476f68 (patch)
treea721bd34238d22cea6f6983d769da08be63524e1
parent87221bd66c2646671450ca8eb97007f2d6e01c5c (diff)
downloadu-boot-af8149e9ac40dbb596fb2f5b72b82feb54476f68.zip
u-boot-af8149e9ac40dbb596fb2f5b72b82feb54476f68.tar.gz
u-boot-af8149e9ac40dbb596fb2f5b72b82feb54476f68.tar.bz2
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>
-rw-r--r--env/sf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/env/sf.c b/env/sf.c
index c251d07..6a4bb75 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;