diff options
| author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-09-06 23:29:53 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-14 10:42:24 -0400 |
| commit | a28cc807fa3abbd3602982c88f1c419c80a7e8b8 (patch) | |
| tree | 51c9446f0d911f569bba9706fab6c68e017d3fd2 | |
| parent | 05f84bd2acc698b22395f14b1e78825a6c085d6a (diff) | |
cmd: nvedit: Remove unused NEEDS_MANUAL_RELOC code bits
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.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
| -rw-r--r-- | cmd/nvedit.c | 11 | ||||
| -rw-r--r-- | env/common.c | 1 | ||||
| -rw-r--r-- | include/env.h | 8 |
3 files changed, 0 insertions, 20 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 9e4ee4b0177..fe99157fd17 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -407,11 +407,7 @@ static int print_active_callback(struct env_entry *entry) for (i = 0, clbkp = ll_entry_start(struct env_clbk_tbl, env_clbk); i < num_callbacks; i++, clbkp++) { -#if defined(CONFIG_NEEDS_MANUAL_RELOC) - if (entry->callback == clbkp->callback + gd->reloc_off) -#else if (entry->callback == clbkp->callback) -#endif break; } @@ -1222,13 +1218,6 @@ static struct cmd_tbl cmd_env_sub[] = { #endif }; -#if defined(CONFIG_NEEDS_MANUAL_RELOC) -void env_reloc(void) -{ - fixup_cmdtable(cmd_env_sub, ARRAY_SIZE(cmd_env_sub)); -} -#endif - static int do_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct cmd_tbl *cp; diff --git a/env/common.c b/env/common.c index 0ecdb248a08..4cf2dadc694 100644 --- a/env/common.c +++ b/env/common.c @@ -429,7 +429,6 @@ int env_export(env_t *env_out) void env_relocate(void) { #if defined(CONFIG_NEEDS_MANUAL_RELOC) - env_reloc(); env_fix_drivers(); env_htab.change_ok += gd->reloc_off; #endif diff --git a/include/env.h b/include/env.h index 1480efa59e3..b28886d80b9 100644 --- a/include/env.h +++ b/include/env.h @@ -357,14 +357,6 @@ char *env_get_default(const char *name); void env_set_default(const char *s, int flags); /** - * env_reloc() - Relocate the 'env' sub-commands - * - * This is used for those unfortunate archs with crappy toolchains - */ -void env_reloc(void); - - -/** * env_import_fdt() - Import environment values from device tree blob * * This uses the value of the environment variable "env_fdt_path" as a |