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/flash.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/flash.c')
| -rw-r--r-- | env/flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env/flash.c b/env/flash.c index 3198147c380..722d5adf8b6 100644 --- a/env/flash.c +++ b/env/flash.c @@ -351,7 +351,7 @@ static int env_flash_load(void) "reading environment; recovered successfully\n\n"); #endif /* CONFIG_ENV_ADDR_REDUND */ - return env_import((char *)flash_addr, 1); + return env_import((char *)flash_addr, 1, H_EXTERNAL); } #endif /* LOADENV */ |