Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

1 files changed, 1 insertions, 16 deletions

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 677142520bb..704589702f2 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -299,24 +299,10 @@ static struct cmd_tbl cmd_pxe_sub[] = {
 	U_BOOT_CMD_MKENT(boot, 3, 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;
 
@@ -333,8 +319,7 @@ static int do_pxe(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 }
 
 U_BOOT_CMD(pxe, 4, 1, do_pxe,
-	   "commands to get and boot from pxe files\n"
-	   "To use IPv6 add -ipv6 parameter",
+	   "get and boot from pxe files",
 	   "get [" USE_IP6_CMD_PARAM "] - try to retrieve a pxe file using tftp\n"
 	   "pxe boot [pxefile_addr_r] [-ipv6] - boot from the pxe file at pxefile_addr_r\n"
 );