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 499e1ddb224b9c766b80e4042401ccde24e18e05..3f922b4097a600c6deed871f2593c135dfa5029e 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -13,7 +13,7 @@ config SPL_LIBGENERIC_SUPPORT
        default y
 
 config SPL_MMC_SUPPORT
-       default y
+       default y if MMC_SDHCI_ZYNQ
 
 config SPL_SERIAL_SUPPORT
        default y
@@ -42,6 +42,13 @@ config SYS_CONFIG_NAME
          Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
          will be used for board configuration.
 
+config SYS_MEM_RSVD_FOR_MMU
+       bool "Reserve memory for MMU Table"
+       help
+         If defined this option is used to setup different space for
+         MMU table than the one which will be allocated during
+         relocation.
+
 config BOOT_INIT_FILE
        string "boot.bin init register filename"
        depends on SPL
@@ -50,12 +57,32 @@ 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"
 
 config SYS_MALLOC_F_LEN
        default 0x600
 
+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.
+
+config ZYNQMP_PSU_INIT_ENABLED
+       bool "Include psu_init"
+       help
+         Include psu_init to full u-boot. SPL include psu_init by default.
+
 config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
        bool "Overwrite SPL bootmode"
        depends on SPL
@@ -75,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"
@@ -111,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