env: Relocate env drivers if manual reloc is required

Relocate env drivers if manual relocation is enabled. This
patch fixes the issue of u-boot hang incase if env is
present in any of the flash devices.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/env/common.c b/env/common.c
index f21ff700969561d022e63b89dad931aa29beada6..8f602de9d28f49412fe779f00f9555f93a794ea9 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -227,6 +227,7 @@ void env_relocate(void)
 {
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
        env_reloc();
+       env_fix_drivers();
        env_htab.change_ok += gd->reloc_off;
 #endif
        if (gd->env_valid == ENV_INVALID) {

diff --git a/env/env.c b/env/env.c
index 3795dbc24e2bcbb80b066146021f8ea085867a32..90d65974d0c9e05c5d4133ca3f6b08f44f20cbdd 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -10,6 +10,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;

diff --git a/include/environment.h b/include/environment.h
index 1b52353365ed03acd852e07e56e910b1e9d82aa7..2bd0ad12a6403d25b89ed9a7adf88eb07c103ba1 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -314,6 +314,11 @@ int env_load(void);
  */
 int env_save(void);
 
+/**
+ * env_fix_drivers() - Updates envdriver as per relocation
+ */
+void env_fix_drivers(void);
+
 void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr);
 int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr);
 int eth_env_set_enetaddr(const char *name, const uint8_t *enetaddr);