Merge git://git.denx.de/u-boot-spi

[people/ms/u-boot.git] / arch / arm / cpu / armv8 / zynqmp / Kconfig

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 4dc8b1caf79eabb5669b3a427ba2130272c2a050..3f922b4097a600c6deed871f2593c135dfa5029e 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -57,6 +57,14 @@ config BOOT_INIT_FILE
          Add register writes to boot.bin format (max 256 pairs).
          Expect a table of register-value pairs, e.g. "0x12345678 0x4321"
 
+config PMUFW_INIT_FILE
+       string "PMU firmware"
+       depends on SPL
+       default ""
+       help
+         Include external PMUFW (Platform Management Unit FirmWare) to
+         a Xilinx bootable image (boot.bin).
+
 config ZYNQMP_USB
        bool "Configure ZynqMP USB"
 
@@ -65,6 +73,7 @@ config SYS_MALLOC_F_LEN
 
 config DEFINE_TCM_OCM_MMAP
        bool "Define TCM and OCM memory in MMU Table"
+       default y if MP
        help
          This option if enabled defines the TCM and OCM memory and its
          memory attributes in MMU table entry.
@@ -93,6 +102,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE
        default 0x7 if USB_MODE
        default 0xa if SW_USBHOST_MODE
        default 0xb if SW_SATA_MODE
+       default 0xe if SD1_LSHFT_MODE
 
 choice
        prompt "Boot mode"
@@ -129,6 +139,9 @@ config SW_USBHOST_MODE
 config SW_SATA_MODE
        bool "SW SATA_MODE"
 
+config SD1_LSHFT_MODE
+       bool "SD1_LSHFT_MODE"
+
 endchoice
 
 endif