summaryrefslogtreecommitdiff
path: root/include/configs/zynq-common.h
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2019-01-03 13:58:27 +0100
committerMichal Simek <michal.simek@xilinx.com>2019-02-14 14:31:09 +0100
commitd13f92b7420a7383cefe33bb1ffc1ae56f0d2f1e (patch)
tree1622715d1715a99c961a0906820cd8bcfdd05f19 /include/configs/zynq-common.h
parent63f7e3fca391a50a499fed828fe16325fdee45f3 (diff)
downloadu-boot-d13f92b7420a7383cefe33bb1ffc1ae56f0d2f1e.tar.gz
ARM: zynq: Run distribution boot commands first
This patch is doing two things. 1. Exchanging order of boot commands. distro_bootcmd is run first followed by Xilinx boot command. 2. Remove CONFIG_BOOTCOMMAND from configs (and follow mainline) by creating Xilinx distribution bootcommand and wiring it as the last bootcommand. QSPI, NAND distribution boot command will be added later. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs/zynq-common.h')
-rw-r--r--include/configs/zynq-common.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1710feda91..6193d67268 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -153,11 +153,18 @@
#define BOOT_TARGET_DEVICES_DHCP(func)
#endif
+#define BOOTENV_DEV_XILINX(devtypeu, devtypel, instance) \
+ "bootcmd_xilinx=run $modeboot\0"
+
+#define BOOTENV_DEV_NAME_XILINX(devtypeu, devtypel, instance) \
+ "xilinx "
+
#define BOOT_TARGET_DEVICES(func) \
BOOT_TARGET_DEVICES_MMC(func) \
BOOT_TARGET_DEVICES_USB(func) \
BOOT_TARGET_DEVICES_PXE(func) \
- BOOT_TARGET_DEVICES_DHCP(func)
+ BOOT_TARGET_DEVICES_DHCP(func) \
+ func(XILINX, xilinx, na)
#include <config_distro_bootcmd.h>
#endif /* CONFIG_SPL_BUILD */