X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=env%2Fenv.c;fp=env%2Fenv.c;h=edfb575c0e01ee9a7c7ea147823612b22d0cf252;hb=e1caa5841e8a9bc0ee658bdacae0519fa28e1e6a;hp=9a89832c1aafc79ba4d59536306a0561e84e2db2;hpb=32fe36574ea5e6ea55313e16547b98a984af7767;p=u-boot

diff --git a/env/env.c b/env/env.c
index 9a89832c1a..edfb575c0e 100644
--- a/env/env.c
+++ b/env/env.c
@@ -62,8 +62,6 @@ static enum env_location env_locations[] = {
 #endif
 };
 
-static enum env_location env_load_location = ENVL_UNKNOWN;
-
 static bool env_has_inited(enum env_location location)
 {
 	return gd->env_has_init & BIT(location);
@@ -108,11 +106,11 @@ __weak enum env_location env_get_location(enum env_operation op, int prio)
 		if (prio >= ARRAY_SIZE(env_locations))
 			return ENVL_UNKNOWN;
 
-		env_load_location = env_locations[prio];
-		return env_load_location;
+		gd->env_load_location = env_locations[prio];
+		return gd->env_load_location;
 
 	case ENVOP_SAVE:
-		return env_load_location;
+		return gd->env_load_location;
 	}
 
 	return ENVL_UNKNOWN;