fit: Verify all configuration signatures

[u-boot] / env / env.c

diff --git a/env/env.c b/env/env.c
index 9a89832c1aafc79ba4d59536306a0561e84e2db2..5c0842ac07eb2d728fef5f349ab0cd8d1b26dc73 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -10,6 +9,27 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
+void env_fix_drivers(void)
+{
+       struct env_driver *drv;
+       const int n_ents = ll_entry_count(struct env_driver, env_driver);
+       struct env_driver *entry;
+
+       drv = ll_entry_start(struct env_driver, env_driver);
+       for (entry = drv; entry != drv + n_ents; entry++) {
+               if (entry->name)
+                       entry->name += gd->reloc_off;
+               if (entry->load)
+                       entry->load += gd->reloc_off;
+               if (entry->save)
+                       entry->save += gd->reloc_off;
+               if (entry->init)
+                       entry->init += gd->reloc_off;
+       }
+}
+#endif
+
 static struct env_driver *_env_driver_lookup(enum env_location loc)
 {
        struct env_driver *drv;
@@ -62,8 +82,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 +126,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;
@@ -149,32 +167,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;
-
-               if (!env_has_inited(drv->location))
-                       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)