* [U-Boot] [PATCH v2] env: Relocate env drivers if manual reloc is required
@ 2018-04-13 5:57 Michal Simek
2018-04-17 1:22 ` [U-Boot] [U-Boot, " Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Michal Simek @ 2018-04-13 5:57 UTC (permalink / raw)
To: u-boot
From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
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>
---
Changes in v2:
- 's/fix_envdriver/env_fix_drivers/g' - by Simon
env/common.c | 1 +
env/env.c | 21 +++++++++++++++++++++
include/environment.h | 5 +++++
3 files changed, 27 insertions(+)
diff --git a/env/common.c b/env/common.c
index f21ff7009695..8f602de9d28f 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 3795dbc24e2b..90d65974d0c9 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;
diff --git a/include/environment.h b/include/environment.h
index 1b52353365ed..2bd0ad12a640 100644
--- 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);
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [U-Boot, v2] env: Relocate env drivers if manual reloc is required
2018-04-13 5:57 [U-Boot] [PATCH v2] env: Relocate env drivers if manual reloc is required Michal Simek
@ 2018-04-17 1:22 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2018-04-17 1:22 UTC (permalink / raw)
To: u-boot
On Fri, Apr 13, 2018 at 07:57:21AM +0200, Michal Simek wrote:
> From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
>
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180416/25b76fff/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-17 1:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-13 5:57 [U-Boot] [PATCH v2] env: Relocate env drivers if manual reloc is required Michal Simek
2018-04-17 1:22 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.