Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / arch / arm / cpu / armv8 / zynqmp / Kconfig

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 1eedb39aa5a864ca91462efd8c1c12b3c23343f6..e175e6eceb0d032676457b2649d9eaabb4cdb636 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -41,6 +41,14 @@ config SYS_CONFIG_NAME
          Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
          will be used for board configuration.
 
+config BOOT_INIT_FILE
+       string "boot.bin init register filename"
+       depends on SPL
+       default ""
+       help
+         Add register writes to boot.bin format (max 256 pairs).
+         Expect a table of register-value pairs, e.g. "0x12345678 0x4321"
+
 config ZYNQMP_USB
        bool "Configure ZynqMP USB"
 
@@ -64,10 +72,12 @@ 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"
-       depends on ZYNQMP_ALT_BOOTMODE_ENABLED
+       depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
        default JTAG
 
 config JTAG_MODE
@@ -94,6 +104,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