env: Load env when ENV_IS_NOWHERE is only location selected

This patch prevent u-boot from hanging on a UltraZed EG board (zynqmp).

Without the patch,
(drv = env_driver_lookup(ENVOP_INIT, prio))
evaluates to 0, causing prio = 0
Then, (!prio) is hit, returning -ENODEV causing a stall.

With the patch,
instead of returning -ENODEV and causing a stall, we
set gd->env_addr (is this really needed?)
and then
mark gd->env_valid = ENV_INVALID to use the default env.

diff --git a/env/env.c b/env/env.c
index e4dfb92e154057516a7459f8273f875bddec37a5..7168cb9d3184624b20d8e617fa2032f390bbf62b 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -322,17 +322,18 @@ int env_init(void)
 
                debug("%s: Environment %s init done (ret=%d)\n", __func__,
                      drv->name, ret);
-
-               if (gd->env_valid == ENV_INVALID)
-                       ret = -ENOENT;
        }
 
-       if (!prio)
-               return -ENODEV;
+       if (!prio) {
+               gd->env_addr = (ulong)&default_environment[0];
+               gd->env_valid = ENV_INVALID;
+
+               return 0;
+       }
 
        if (ret == -ENOENT) {
                gd->env_addr = (ulong)&default_environment[0];
-               gd->env_valid = ENV_VALID;
+               gd->env_valid = ENV_INVALID;
 
                return 0;
        }