[PATCH] arm64: zynqmp: Add third backup bootmode

[PATCH] arm64: zynqmp: Add third backup bootmode

[Michal Simek]

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 <michal.simek@xilinx.com>
---

 arch/arm/mach-zynqmp/spl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 896657f51c3d..b3830182e250 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)
-- 
2.25.1

[PATCH] arm64: zynqmp: Add third backup bootmode

[Michal Simek]

st 11. 3. 2020 v 15:13 odes?latel Michal Simek <michal.simek@xilinx.com> napsal:
>
> 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 <michal.simek@xilinx.com>
> ---
>
>  arch/arm/mach-zynqmp/spl.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
> index 896657f51c3d..b3830182e250 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)
> --
> 2.25.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs