]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
command: Remove unused NEEDS_MANUAL_RELOC code bits
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Wed, 6 Sep 2023 21:29:43 +0000 (23:29 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 14 Sep 2023 14:42:24 +0000 (10:42 -0400)
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>
include/command.h

index c4e3170967d342a548c8970f797547531f86c239..ae7bb4a30b05c18d3806f83e83dbad7855cb85b9 100644 (file)
@@ -318,24 +318,6 @@ int cmd_source_script(ulong addr, const char *fit_uname, const char *confname);
 # define _CMD_HELP(x)
 #endif
 
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-#define U_BOOT_SUBCMDS_RELOC(_cmdname)                                 \
-       static void _cmdname##_subcmds_reloc(void)                      \
-       {                                                               \
-               static int relocated;                                   \
-                                                                       \
-               if (relocated)                                          \
-                       return;                                         \
-                                                                       \
-               fixup_cmdtable(_cmdname##_subcmds,                      \
-                              ARRAY_SIZE(_cmdname##_subcmds));         \
-               relocated = 1;                                          \
-       }
-#else
-#define U_BOOT_SUBCMDS_RELOC(_cmdname)                                 \
-       static void _cmdname##_subcmds_reloc(void) { }
-#endif
-
 #define U_BOOT_SUBCMDS_DO_CMD(_cmdname)                                        \
        static int do_##_cmdname(struct cmd_tbl *cmdtp, int flag,       \
                                 int argc, char *const argv[],          \
@@ -343,8 +325,6 @@ int cmd_source_script(ulong addr, const char *fit_uname, const char *confname);
        {                                                               \
                struct cmd_tbl *subcmd;                                 \
                                                                        \
-               _cmdname##_subcmds_reloc();                             \
-                                                                       \
                /* We need at least the cmd and subcmd names. */        \
                if (argc < 2 || argc > CONFIG_SYS_MAXARGS)              \
                        return CMD_RET_USAGE;                           \
@@ -379,7 +359,6 @@ int cmd_source_script(ulong addr, const char *fit_uname, const char *confname);
 
 #define U_BOOT_SUBCMDS(_cmdname, ...)                                  \
        static struct cmd_tbl _cmdname##_subcmds[] = { __VA_ARGS__ };   \
-       U_BOOT_SUBCMDS_RELOC(_cmdname)                                  \
        U_BOOT_SUBCMDS_DO_CMD(_cmdname)                                 \
        U_BOOT_SUBCMDS_COMPLETE(_cmdname)