diff mbox series

cmd: pxe: Add relocation to pxe_sub cmds

Message ID cdac8791b9de57d80b448b80ccaea257ce73f199.1600246120.git.michal.simek@xilinx.com
State Accepted
Commit 504d179157aec248e61ff0a39e1a2cf13d3fd4fa
Delegated to: Tom Rini
Headers show
Series cmd: pxe: Add relocation to pxe_sub cmds | expand

Commit Message

Michal Simek Sept. 16, 2020, 8:48 a.m. UTC 
From: T Karthik Reddy <t.karthik.reddy@xilinx.com>

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>
---

 cmd/pxe.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

Simon Glass Sept. 17, 2020, 1:10 a.m. UTC | #1 
On Wed, 16 Sep 2020 at 02:48, Michal Simek <michal.simek@xilinx.com> wrote:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> 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>
> ---
>
>  cmd/pxe.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
Michal Simek Sept. 23, 2020, 12:31 p.m. UTC | #2 
st 16. 9. 2020 v 10:48 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> 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>
> ---
>
>  cmd/pxe.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/cmd/pxe.c b/cmd/pxe.c
> index 6372fc987187..46ac08fa3a03 100644
> --- 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;
>
> --
> 2.28.0
>

Applied.
M
diff mbox series

Patch

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 6372fc987187..46ac08fa3a03 100644
--- 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;