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>

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 9e4ee4b0177b9136dc86801f906c50355901e241..fe99157fd17baa6ef534da3a0b2838662eea80e4 100644 (file)
--- 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 0ecdb248a08207085e778e15d07beae397d98473..4cf2dadc6945e255990d7420a9ad6c9de3e10f26 100644 (file)
--- 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 1480efa59e358f1e6c5bc9d653433a31c3619b56..b28886d80b92991e1e4326d9e21d99dd2299a075 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -356,14 +356,6 @@ char *env_get_default(const char *name);
 /* [re]set to the default environment */
 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
  *