boot: 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/boot/bootm_os.c b/boot/bootm_os.c
index 99ff0e6c02d26b20b29c6f1fcee75aaa975216fe..9c035b5be886d875b031073676c50b580881d402 100644 (file)
--- a/boot/bootm_os.c
+++ b/boot/bootm_os.c
@@ -609,19 +609,5 @@ int boot_selected_os(int argc, char *const argv[], int state,
 
 boot_os_fn *bootm_os_get_boot_func(int os)
 {
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-       static bool relocated;
-
-       if (!relocated) {
-               int i;
-
-               /* relocate boot function table */
-               for (i = 0; i < ARRAY_SIZE(boot_os); i++)
-                       if (boot_os[i] != NULL)
-                               boot_os[i] += gd->reloc_off;
-
-               relocated = true;
-       }
-#endif
        return boot_os[os];
 }

diff --git a/boot/image-sig.c b/boot/image-sig.c
index 1aa0b586450a50d5bbaf87bbdcef826db6c9e04c..b5692d58b24bdf583bcaa1e647e4471ee5ea84ce 100644 (file)
--- a/boot/image-sig.c
+++ b/boot/image-sig.c
@@ -57,20 +57,6 @@ struct checksum_algo *image_get_checksum_algo(const char *full_name)
        int i;
        const char *name;
 
-       if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
-               static bool done;
-
-               if (!done) {
-                       done = true;
-                       for (i = 0; i < ARRAY_SIZE(checksum_algos); i++) {
-                               struct checksum_algo *algo = &checksum_algos[i];
-
-                               MANUAL_RELOC(algo->name);
-                               MANUAL_RELOC(algo->calculate);
-                       }
-               }
-       }
-
        for (i = 0; i < ARRAY_SIZE(checksum_algos); i++) {
                name = checksum_algos[i].name;
                /* Make sure names match and next char is a comma */
@@ -87,20 +73,6 @@ struct crypto_algo *image_get_crypto_algo(const char *full_name)
        struct crypto_algo *crypto, *end;
        const char *name;
 
-       if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
-               static bool done;
-
-               if (!done) {
-                       done = true;
-                       crypto = ll_entry_start(struct crypto_algo, cryptos);
-                       end = ll_entry_end(struct crypto_algo, cryptos);
-                       for (; crypto < end; crypto++) {
-                               MANUAL_RELOC(crypto->name);
-                               MANUAL_RELOC(crypto->verify);
-                       }
-               }
-       }
-
        /* Move name to after the comma */
        name = strchr(full_name, ',');
        if (!name)

diff --git a/cmd/bootm.c b/cmd/bootm.c
index 37c2af96e08705149a5be75c7224c362c51a65e4..7968415b6d1e7c58560c586aa0b4933c6e4d0a4e 100644 (file)
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -123,20 +123,6 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        int states;
        int ret;
 
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-       static int relocated = 0;
-
-       if (!relocated) {
-               int i;
-
-               /* relocate names of sub-command table */
-               for (i = 0; i < ARRAY_SIZE(cmd_bootm_sub); i++)
-                       cmd_bootm_sub[i].name += gd->reloc_off;
-
-               relocated = 1;
-       }
-#endif
-
        /* determine if we have a sub command */
        argc--; argv++;
        if (argc > 0) {