dfu: tftp: Fix arm64 build warnings

[people/ms/u-boot.git] / env / env.c

diff --git a/env/env.c b/env/env.c
index 264917e0f1d93c4279f121ad6c2d215b72284892..3795dbc24e2bcbb80b066146021f8ea085867a32 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -62,7 +62,22 @@ 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);
+}
+
+static void env_set_inited(enum env_location location)
+{
+       /*
+        * We're using a 32-bits bitmask stored in gd (env_has_init)
+        * using the above enum value as the bit index. We need to
+        * make sure that we're not overflowing it.
+        */
+       BUILD_BUG_ON(ARRAY_SIZE(env_locations) > BITS_PER_LONG);
+
+       gd->env_has_init |= BIT(location);
+}
 
 /**
  * env_get_location() - Returns the best env location for a board
@@ -71,6 +86,7 @@ static enum env_location env_load_location = ENVL_UNKNOWN;
  *        highest priority
  *
  * This will return the preferred environment for the given priority.
+ * This is overridable by boards if they need to.
  *
  * All implementations are free to use the operation, the priority and
  * any other data relevant to their choice, but must take into account
@@ -81,7 +97,7 @@ static enum env_location env_load_location = ENVL_UNKNOWN;
  * Returns:
  * an enum env_location value on success, a negative error code otherwise
  */
-static enum env_location env_get_location(enum env_operation op, int prio)
+__weak enum env_location env_get_location(enum env_operation op, int prio)
 {
        switch (op) {
        case ENVOP_GET_CHAR:
@@ -90,11 +106,11 @@ static 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;
@@ -131,29 +147,17 @@ static struct env_driver *env_driver_lookup(enum env_operation op, int prio)
        return drv;
 }
 
-int env_get_char(int index)
+__weak int env_get_char_spec(int index)
 {
-       struct env_driver *drv;
-       int prio;
+       return *(uchar *)(gd->env_addr + index);
+}
 
+int env_get_char(int index)
+{
        if (gd->env_valid == ENV_INVALID)
                return default_environment[index];
-
-       for (prio = 0; (drv = env_driver_lookup(ENVOP_GET_CHAR, prio)); prio++) {
-               int ret;
-
-               if (!drv->get_char)
-                       continue;
-
-               ret = drv->get_char(index);
-               if (!ret)
-                       return 0;
-
-               debug("%s: Environment %s failed to load (err=%d)\n", __func__,
-                     drv->name, ret);
-       }
-
-       return -ENODEV;
+       else
+               return env_get_char_spec(index);
 }
 
 int env_load(void)
@@ -167,6 +171,9 @@ int env_load(void)
                if (!drv->load)
                        continue;
 
+               if (!env_has_inited(drv->location))
+                       continue;
+
                printf("Loading Environment from %s... ", drv->name);
                ret = drv->load();
                if (ret)
@@ -192,6 +199,9 @@ int env_save(void)
                if (!drv->save)
                        continue;
 
+               if (!env_has_inited(drv->location))
+                       continue;
+
                printf("Saving Environment to %s... ", drv->name);
                ret = drv->save();
                if (ret)
@@ -213,14 +223,10 @@ int env_init(void)
        int prio;
 
        for (prio = 0; (drv = env_driver_lookup(ENVOP_INIT, prio)); prio++) {
-               if (!drv->init)
-                       continue;
-
-               ret = drv->init();
-               if (!ret)
-                       return 0;
+               if (!drv->init || !(ret = drv->init()))
+                       env_set_inited(drv->location);
 
-               debug("%s: Environment %s failed to init (err=%d)\n", __func__,
+               debug("%s: Environment %s init done (ret=%d)\n", __func__,
                      drv->name, ret);
        }