]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
dm: cmd: Relocate subcommands when MANUAL_RELOC
authorMichal Simek <michal.simek@xilinx.com>
Fri, 4 Dec 2015 10:42:01 +0000 (11:42 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 7 Dec 2015 09:14:30 +0000 (10:14 +0100)
Subcommands contain pointers to functions which are not updated when
MANUAL_RELOC is enabled. This patch fix it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
test/dm/cmd_dm.c

index caff49aa4f6201aa4358968d21aca6bf37689f4d..b6e71091497c3a68d92c92c4a3037337e76dfb3d 100644 (file)
@@ -46,11 +46,25 @@ static cmd_tbl_t test_commands[] = {
        U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""),
 };
 
+static __maybe_unused void dm_reloc(void)
+{
+       static int relocated;
+
+       if (!relocated) {
+               fixup_cmdtable(test_commands, ARRAY_SIZE(test_commands));
+               relocated = 1;
+       }
+}
+
 static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        cmd_tbl_t *test_cmd;
        int ret;
 
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+       dm_reloc();
+#endif
+
        if (argc < 2)
                return CMD_RET_USAGE;
        test_cmd = find_cmd_tbl(argv[1], test_commands,