diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-14 16:23:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-14 16:23:49 -0400 |
| commit | 2fe4b54556ea6271237b35de68dc458bfceab94c (patch) | |
| tree | e98df3cab8a288829e16bab3999af50550163942 /env/callback.c | |
| parent | 3cba5a115ff8b5aeca62e5ae7dfad6bacb32e9fd (diff) | |
| parent | 4babaa0c28becc2b80db13daa6f30d8f4d35e94e (diff) | |
Merge branch '2023-09-14-remove-NEEDS_MANUAL_RELOC' into next
To quote the author:
The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8f8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.
This is a follow up on way over decade old commit
2e5167ccad93 ("Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC")
"
By now, the majority of architectures have working relocation
support, so the few remaining architectures have become exceptions.
To make this more obvious, we make working relocation now the default
case, and flag the remaining cases with CONFIG_NEEDS_MANUAL_RELOC.
"
It took a bit longer than expected, but now we can really sunset
CONFIG_NEEDS_MANUAL_RELOC.
Make it so.
Diffstat (limited to 'env/callback.c')
| -rw-r--r-- | env/callback.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/env/callback.c b/env/callback.c index 638a02b28f7..98ddba035ea 100644 --- a/env/callback.c +++ b/env/callback.c @@ -9,10 +9,6 @@ #include <env_internal.h> #include <asm/global_data.h> -#if defined(CONFIG_NEEDS_MANUAL_RELOC) -DECLARE_GLOBAL_DATA_PTR; -#endif - /* * Look up a callback function pointer by name */ @@ -71,11 +67,7 @@ void env_callback_init(struct env_entry *var_entry) if (!ret && strlen(callback_name)) { clbkp = find_env_callback(callback_name); if (clbkp != NULL) -#if defined(CONFIG_NEEDS_MANUAL_RELOC) - var_entry->callback = clbkp->callback + gd->reloc_off; -#else var_entry->callback = clbkp->callback; -#endif } } @@ -112,11 +104,7 @@ static int set_callback(const char *name, const char *value, void *priv) /* assign the requested callback */ clbkp = find_env_callback(value); if (clbkp != NULL) -#if defined(CONFIG_NEEDS_MANUAL_RELOC) - ep->callback = clbkp->callback + gd->reloc_off; -#else ep->callback = clbkp->callback; -#endif } } |