[PATCH] env: Load env when ENV_IS_NOWHERE is only location selected

[PATCH] env: Load env when ENV_IS_NOWHERE is only location selected

[Felix.Vietmeyer at jila.colorado.edu]

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.

---
 env/env.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/env/env.c b/env/env.c
index e534008006..44a65ab216 100644
--- a/env/env.c
+++ b/env/env.c
@@ -335,17 +335,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;
 	}
-- 
2.17.1

Re: [PATCH] env: Load env when ENV_IS_NOWHERE is only location selected

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

On Tue, Apr 20, 2021 at 08:04:26PM -0600, Felix.Vietmeyer@jila.colorado.edu wrote:

> 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.

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]