summaryrefslogtreecommitdiff
path: root/env/nand.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-31 10:13:07 -0400
committerTom Rini <trini@konsulko.com>2020-07-31 10:13:07 -0400
commita2d051e7b6a8f87add1067d936bb0c805a47b0df (patch)
tree671af1a640f1fbb27f87a82685d8be9e632ee564 /env/nand.c
parent719f42190d5f0238cb01ef2ffba8af2285f7bc7a (diff)
parentdb82015929aeff6b58982a22d61ab8c5b87752f3 (diff)
Merge branch '2020-07-31-more-env-updates'
- Fix EFI selftest to not force setting serial# environment (and also get the U-Boot prompt dynamically). - Support for append only environment and other related features. - Improved ext4 environment support - Fix the case of fw_setenv being used on flash devices that were not already locked.
Diffstat (limited to 'env/nand.c')
-rw-r--r--env/nand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/env/nand.c b/env/nand.c
index 8b0027d3047..0d7ee19bc23 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -331,7 +331,7 @@ static int env_nand_load(void)
read2_fail = readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2);
ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2,
- read2_fail);
+ read2_fail, H_EXTERNAL);
done:
free(tmp_env1);
@@ -372,7 +372,7 @@ static int env_nand_load(void)
return -EIO;
}
- return env_import(buf, 1);
+ return env_import(buf, 1, H_EXTERNAL);
#endif /* ! ENV_IS_EMBEDDED */
return 0;