]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: pxe: Add relocation to pxe_sub cmds
authorT Karthik Reddy <t.karthik.reddy@xilinx.com>
Wed, 16 Sep 2020 07:13:56 +0000 (01:13 -0600)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 23 Sep 2020 12:29:57 +0000 (14:29 +0200)
pxe sub commands need to be manually relocated for architectures which
enables MANUAL_RELOC as Microblaze.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
cmd/pxe.c

index 6372fc987187a35667ce978e50a6ceb94ad7231f..46ac08fa3a031b61688dae7a34da41c74333d165 100644 (file)
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -212,10 +212,24 @@ static struct cmd_tbl cmd_pxe_sub[] = {
        U_BOOT_CMD_MKENT(boot, 2, 1, do_pxe_boot, "", "")
 };
 
+static void __maybe_unused pxe_reloc(void)
+{
+       static int relocated_pxe;
+
+       if (!relocated_pxe) {
+               fixup_cmdtable(cmd_pxe_sub, ARRAY_SIZE(cmd_pxe_sub));
+               relocated_pxe = 1;
+       }
+}
+
 static int do_pxe(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        struct cmd_tbl *cp;
 
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
+       pxe_reloc();
+#endif
+
        if (argc < 2)
                return CMD_RET_USAGE;