summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--env/flash.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/env/flash.c b/env/flash.c
index 0f7393d830c..31dd1656e72 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -108,6 +108,14 @@ static int env_flash_init(void)
} else if (flag2 == 0xFF) {
gd->env_addr = addr2;
gd->env_valid = ENV_REDUND;
+ } else {
+ /*
+ * Unrecognized flag pair (e.g. bit-flip on NOR flash).
+ * Default to primary copy to prevent unintended pointer
+ * swap in env_flash_load().
+ */
+ gd->env_addr = addr1;
+ gd->env_valid = ENV_REDUND;
}
return 0;