Message ID | 20200728095128.2363-3-patrick.delaunay@st.com |
---|---|
State | Accepted |
Commit | 286fee5062ed31bd0373d3fc43ebe22d85bca4ae |
Delegated to: | Tom Rini |
Headers | show |
Series | env: ext4: corrections and add test for env in ext4 | expand |
On Tue, Jul 28, 2020 at 11:51:15AM +0200, Patrick Delaunay wrote: > Add a missing initialization of gd->env_valid in env_ext4_load > as it is already done in some other env device. > > Set gd->env_valid = ENV_VALID in env_ext4_save() and env_ext4_load(). > > This patch allows to have a correct information in 'env info' command. > > Reviewed-by: Tom Rini <trini@konsulko.com> > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Applied to u-boot/master, thanks!
diff --git a/env/ext4.c b/env/ext4.c index 8e90bb71b7..ac9f126bec 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -32,6 +32,8 @@ #include <ext4fs.h> #include <mmc.h> +DECLARE_GLOBAL_DATA_PTR; + __weak const char *env_ext4_get_intf(void) { return (const char *)CONFIG_ENV_EXT4_INTERFACE; @@ -79,6 +81,7 @@ static int env_ext4_save(void) CONFIG_ENV_EXT4_FILE, ifname, dev, part); return 1; } + gd->env_valid = ENV_VALID; puts("done\n"); return 0; @@ -124,7 +127,11 @@ static int env_ext4_load(void) goto err_env_relocate; } - return env_import(buf, 1); + err = env_import(buf, 1); + if (!err) + gd->env_valid = ENV_VALID; + + return err; err_env_relocate: env_set_default(NULL, 0);