From: Michal Simek Date: Wed, 11 Mar 2020 14:00:51 +0000 (+0100) Subject: arm64: zynqmp: Add third backup bootmode X-Git-Tag: v2020.07-rc1~41^2~4^2~15 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f1433d0dc929b277551cd6095252b67ebe75307c;p=oweals%2Fu-boot.git arm64: zynqmp: Add third backup bootmode I found this issue when was running py/test.py on zcu102 which is for me by default setup to SD boot mode without any way to change boot mode. Alternative software bootmode selection to JTAG is not working because JTAG mode is 0 which also reset value for it. That's why saying SPL to take u-boot.itb from RAM instead of SD in SD boot mode is not possible via alternative bootmode selection. That's why setup third boot mode to JTAG(BOOT_DEVICE_RAM) as final fallback. Signed-off-by: Michal Simek --- diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index 896657f51c..b3830182e2 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -66,6 +66,8 @@ void board_boot_order(u32 *spl_boot_list) spl_boot_list[1] = BOOT_DEVICE_MMC2; if (spl_boot_list[0] == BOOT_DEVICE_MMC2) spl_boot_list[1] = BOOT_DEVICE_MMC1; + + spl_boot_list[2] = BOOT_DEVICE_RAM; } u32 spl_boot_device(void)