Michael wrote: commit 92765f45bb95 ("env: Access Environment in SPI flashes before relocation") at least breaks the Kontron sl28 board. I guess it also breaks others which use a (late) SPI environment.
reason is, that env_init() sets the init bit, if there is no init function defined in an environment driver, and use default return value -ENOENT in this case later for setting the default environment.
Change: Environment driver can now implement an init function and return, if this function does nothing, simply -ENOENT.
env_init() now handles -ENOENT correct by setting the inited bit for the environment driver. And if there is no other environment driver whose init function returns 0, load than the default environment.
This prevents that each environment driver needs to set the default environment.
Fixes: 92765f45bb95 ("env: Access Environment in SPI flashes before relocation") Reported-by: Michael Walle michael@walle.cc Signed-off-by: Heiko Schocher hs@denx.de ---
travis build: https://travis-ci.org/github/hsdenx/u-boot-test/builds/741049813
env/env.c | 2 ++ env/sf.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/env/env.c b/env/env.c index 42c7d8155e..37b4b54cb7 100644 --- a/env/env.c +++ b/env/env.c @@ -329,6 +329,8 @@ int env_init(void) for (prio = 0; (drv = env_driver_lookup(ENVOP_INIT, prio)); prio++) { if (!drv->init || !(ret = drv->init())) env_set_inited(drv->location); + if (ret == -ENOENT) + env_set_inited(drv->location);
debug("%s: Environment %s init done (ret=%d)\n", __func__, drv->name, ret); diff --git a/env/sf.c b/env/sf.c index 2eb2de1a4e..91ed2860ed 100644 --- a/env/sf.c +++ b/env/sf.c @@ -393,10 +393,12 @@ static int env_sf_init(void) return env_sf_init_early(); #endif /* - * we must return with 0 if there is nothing done, - * else env_set_inited() get not called in env_init() + * return here -ENOENT, so env_init() + * can set the init bit and later if no + * other Environment storage is defined + * can set the default environment */ - return 0; + return -ENOENT; }
U_BOOT_ENV_LOCATION(sf) = {