From 2661081c305ebd1c8c44bebab57493a0ff8c06a9 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 26 Oct 2016 09:24:32 +0200 Subject: ARM64: zynqmp: List secondary software boot modes Using alternative bootmode field to support automatic secondary boot modes. It is purely software setting where SW modes are using free bootmode combinations. Signed-off-by: Michal Simek --- arch/arm/cpu/armv8/zynqmp/Kconfig | 8 ++++++++ arch/arm/cpu/armv8/zynqmp/spl.c | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'arch/arm/cpu/armv8') diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index d20af04191..f354aae3fc 100644 --- a/arch/arm/cpu/armv8/zynqmp/Kconfig +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig @@ -71,6 +71,8 @@ config SPL_ZYNQMP_ALT_BOOTMODE default 0x5 if SD_MODE1 default 0x6 if EMMC_MODE default 0x7 if USB_MODE + default 0xa if SW_USBHOST_MODE + default 0xb if SW_SATA_MODE choice prompt "Boot mode" @@ -101,6 +103,12 @@ config EMMC_MODE config USB_MODE bool "USB" +config SW_USBHOST_MODE + bool "SW USBHOST_MODE" + +config SW_SATA_MODE + bool "SW SATA_MODE" + endchoice endif diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/cpu/armv8/zynqmp/spl.c index bdbd61380a..f5f550f9e2 100644 --- a/arch/arm/cpu/armv8/zynqmp/spl.c +++ b/arch/arm/cpu/armv8/zynqmp/spl.c @@ -91,6 +91,10 @@ u32 spl_boot_device(void) #ifdef CONFIG_SPL_DFU_SUPPORT case USB_MODE: return BOOT_DEVICE_DFU; +#endif +#ifdef CONFIG_SPL_SATA_SUPPORT + case SW_SATA_MODE: + return BOOT_DEVICE_SATA; #endif default: printf("Invalid Boot Mode:0x%x\n", bootmode); -- cgit