From 6f94daf9151e76f68a2a46d15862e232436a14e3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 21 Oct 2019 12:54:20 +0200 Subject: [PATCH] common: command: Fix manual relocation for repeatable command All platforms which are using MANUAL_RELOC are jumping back to origin location when repeatable command is called. The reason is that cmd_rep link is not updated properly. Issue can be reproduced by rewriting origin U-Boot location through (for example) file download by tftp command. Fixes: 80a48dd47e3b ("common: command: Rework the 'cmd is repeatable' logic") Signed-off-by: Michal Simek --- common/command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/command.c b/common/command.c index 4b887a267f..ceca992510 100644 --- a/common/command.c +++ b/common/command.c @@ -496,6 +496,11 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size) for (i = 0; i < size; i++) { ulong addr; + addr = (ulong)(cmdtp->cmd_rep) + gd->reloc_off; + cmdtp->cmd_rep = + (int (*)(struct cmd_tbl_s *, int, int, + char * const [], int *))addr; + addr = (ulong)(cmdtp->cmd) + gd->reloc_off; #ifdef DEBUG_COMMANDS printf("Command \"%s\": 0x%08lx => 0x%08lx\n", -- 2.25.1