Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze

[platform/kernel/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 a3baae4..5ffc9f6 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
@@ -28,6 +28,7 @@ config SYS_BOARD
        default "zynqmp"
 
 config SYS_VENDOR
+       string "Vendor name"
        default "xilinx"
 
 config SYS_SOC
@@ -43,6 +44,7 @@ config SYS_CONFIG_NAME
 
 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).
@@ -54,6 +56,17 @@ config ZYNQMP_USB
 config SYS_MALLOC_F_LEN
        default 0x600
 
+config DEFINE_TCM_OCM_MMAP
+       bool "Define TCM and OCM memory in MMU Table"
+       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
@@ -71,10 +84,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
@@ -101,6 +116,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