aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-09-24 08:33:47 -0400
committerTom Rini <trini@konsulko.com>2020-09-24 08:33:47 -0400
commit67ece26d8b5d4bfa4fda8c456261c465d0815d7d (patch)
tree58d6f1e224c68b9b7b710f63087cb4468394aba7 /cmd
parente119de72e3ae3accf831b5541d83d5c2faf031ff (diff)
parent4ab3817ff16a154981f9394a2c4a0f8f6a72713b (diff)
downloadu-boot-67ece26d8b5d4bfa4fda8c456261c465d0815d7d.zip
u-boot-67ece26d8b5d4bfa4fda8c456261c465d0815d7d.tar.gz
u-boot-67ece26d8b5d4bfa4fda8c456261c465d0815d7d.tar.bz2
Merge tag 'xilinx-for-v2021.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2021.01 arm64: - Support for bigger U-Boot images compiled with PIE microblaze: - Extend support for LE/BE systems zynqmp: - Refactor silicon ID detection code with using firmware interface - Add support for saving variables based on bootmode zynqmp-r5: - Fix MPU mapping and defconfig setting. xilinx: - Minor driver changes: names alignment - Enable UBIFS - Minor DT and macros fixes - Fix boot with appended DT - Fix distro boot cmd: - pxe: Add fixing for platforms with manual relocation support clk: - fixed_rate: Add DM flag to support early boot on r5 fpga: - zynqmppl: Use only firmware interface and enable SPL build serial: - uartlite: Enable for ARM systems and support endians mmc: - zynq: Fix indentation net: - gem: Support for multiple phys - emac: Fix 64bit support and enable it for arm64 kconfig: - Setup default values for Xilinx platforms - Fix dependecies for Xilinx drivers - Source board Kconfig only when platform is enabled - Fix FPGA Kconfig entry with SPL - Change some defconfig values bindings: - Add binding doc for vsc8531
Diffstat (limited to 'cmd')
-rw-r--r--cmd/pxe.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 6372fc9..46ac08f 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;