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

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 34df59db9f0f3ee01da39062411c415b9d2a9bdc..a8525ad5d0caf6528c2037f4e6dd71bb5553313d 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -56,6 +56,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"
@@ -86,6 +88,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/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index e7738faaf896d4b04576acd90c8ce817fb12fa0a..5908c50d09460a359150a73d65a1a60d9da0d914 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -83,6 +83,9 @@ struct iou_scntr_secure {
 #define JTAG_MODE      0x00000000
 #define BOOT_MODE_USE_ALT      0x100
 #define BOOT_MODE_ALT_SHIFT    12
+/* SW secondary boot modes 0xa - 0xd */
+#define SW_USBHOST_MODE        0x0000000A
+#define SW_SATA_MODE   0x0000000B
 
 #define ZYNQMP_IOU_SLCR_BASEADDR       0xFF180000