diff options
| author | Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> | 2018-04-13 07:57:21 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-16 18:45:35 -0400 |
| commit | 7bcdf19572c8f64552233d04b309903b297d5b63 (patch) | |
| tree | 56e68971a4a8072f2f4c75da65335eb13f82aefa /env | |
| parent | 90e407ae01838692bacfbcbcb83d0fb33f3ba7e7 (diff) | |
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>
Diffstat (limited to 'env')
| -rw-r--r-- | env/common.c | 1 | ||||
| -rw-r--r-- | env/env.c | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/env/common.c b/env/common.c index f21ff700969..8f602de9d28 100644 --- 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 3795dbc24e2..90d65974d0c 100644 --- 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; |