diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-31 10:13:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-31 10:13:07 -0400 |
| commit | a2d051e7b6a8f87add1067d936bb0c805a47b0df (patch) | |
| tree | 671af1a640f1fbb27f87a82685d8be9e632ee564 /env/mmc.c | |
| parent | 719f42190d5f0238cb01ef2ffba8af2285f7bc7a (diff) | |
| parent | db82015929aeff6b58982a22d61ab8c5b87752f3 (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/mmc.c')
| -rw-r--r-- | env/mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/env/mmc.c b/env/mmc.c index aca61b75e99..af7e5fbac3a 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -338,7 +338,7 @@ static int env_mmc_load(void) read2_fail = read_env(mmc, CONFIG_ENV_SIZE, offset2, tmp_env2); ret = env_import_redund((char *)tmp_env1, read1_fail, (char *)tmp_env2, - read2_fail); + read2_fail, H_EXTERNAL); fini: fini_mmc_for_env(mmc); @@ -380,7 +380,7 @@ static int env_mmc_load(void) goto fini; } - ret = env_import(buf, 1); + ret = env_import(buf, 1, H_EXTERNAL); if (!ret) { ep = (env_t *)buf; gd->env_addr = (ulong)&ep->data; |