| Message ID | 20200625075958.9868-5-patrick.delaunay@st.com |
|---|---|
| State | Accepted |
| Commit | 6d8d8400a2bee44e0efbd7dbcfa33965560370d6 |
| Headers | show |
| Series | env: ext4: corrections and add test for env in ext4 | expand |
On Thu, Jun 25, 2020 at 09:59:48AM +0200, Patrick Delaunay wrote: > Only update gd->env_load_prio in generic function env_load() > and no more in the weak function env_get_location() which is > called in many place (for example in env_driver_lookup, even > for ENVOP_SAVE operation). > > This patch is a preliminary step to use env_driver_lookup()/ > env_get_location() in new function env_select() without > updating gd->env_load_prio. > > Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com> Reviewed-by: Tom Rini <trini at konsulko.com>
diff --git a/env/env.c b/env/env.c index dcc25c030b..181aaa222c 100644 --- a/env/env.c +++ b/env/env.c @@ -131,8 +131,6 @@ __weak enum env_location env_get_location(enum env_operation op, int prio) if (prio >= ARRAY_SIZE(env_locations)) return ENVL_UNKNOWN; - gd->env_load_prio = prio; - return env_locations[prio]; } @@ -204,6 +202,8 @@ int env_load(void) ret = drv->load(); if (!ret) { printf("OK\n"); + gd->env_load_prio = prio; + return 0; } else if (ret == -ENOMSG) { /* Handle "bad CRC" case */ @@ -227,7 +227,8 @@ int env_load(void) debug("Selecting environment with bad CRC\n"); else best_prio = 0; - env_get_location(ENVOP_LOAD, best_prio); + + gd->env_load_prio = best_prio; return -ENODEV; }
Only update gd->env_load_prio in generic function env_load() and no more in the weak function env_get_location() which is called in many place (for example in env_driver_lookup, even for ENVOP_SAVE operation). This patch is a preliminary step to use env_driver_lookup()/ env_get_location() in new function env_select() without updating gd->env_load_prio. Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com> --- Changes in v3: - new env/env.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)