Merge tag 'u-boot-imx-20200121' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-zynq / Kconfig

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 7a1aec45e79aa7532fe82e9f2541afd86e630752..79f831e6df2ca16251d51a11ee74fd4620f8c45a 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,65 +1,73 @@
 if ARCH_ZYNQ
 
-config ZYNQ_CUSTOM_INIT
-       bool "Use custom ps7_init provided by Xilinx tool"
-       help
-         U-Boot includes ps7_init_gpl.[ch] for some Zynq board variants.
-         If you want to override them with customized ones
-         or ps7_init code for your board is missing, please say Y here
-         and add ones into board/xilinx/zynq/custom_hw_platform/ directory.
-
-choice
-       prompt "Xilinx Zynq board select"
-       default TARGET_ZYNQ_ZC702
+config SPL_LDSCRIPT
+       default "arch/arm/mach-zynq/u-boot-spl.lds"
 
-config TARGET_ZYNQ_ZED
-       bool "Zynq ZedBoard"
+config SPL_FS_FAT
+       default y
 
-config TARGET_ZYNQ_MICROZED
-       bool "Zynq MicroZed"
+config SPL_LIBCOMMON_SUPPORT
+       default y
 
-config TARGET_ZYNQ_PICOZED
-       bool "Zynq PicoZed"
+config SPL_LIBDISK_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZC70X
-       bool "Zynq ZC702/ZC706 Board (deprecated)"
-       select ZYNQ_CUSTOM_INIT
-       help
-         This option is deprecated.  Use TARGET_ZYNQ_ZC702
-         or TARGET_ZYNQ_706.
+config SPL_LIBGENERIC_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZC702
-       bool "Zynq ZC702 Board"
+config SPL_MMC_SUPPORT
+       default y if MMC_SDHCI_ZYNQ
 
-config TARGET_ZYNQ_ZC706
-       bool "Zynq ZC706 Board"
+config SPL_SERIAL_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZC770
-       bool "Zynq ZC770 Board"
-       select ZYNQ_CUSTOM_INIT
+config SPL_SPI_FLASH_SUPPORT
+       default y if ZYNQ_QSPI
 
-config TARGET_ZYNQ_ZYBO
-       bool "Zynq Zybo Board"
-       select ZYNQ_CUSTOM_INIT
+config SPL_SPI_SUPPORT
+       default y if ZYNQ_QSPI
 
-endchoice
+config ZYNQ_DDRC_INIT
+       bool "Zynq DDRC initialization"
+       default y
+       help
+         This option used to perform DDR specific initialization
+         if required. There might be cases like ddr less where we
+         want to skip ddr init and this option is useful for it.
 
 config SYS_BOARD
+       string "Board name"
        default "zynq"
 
 config SYS_VENDOR
+       string "Vendor name"
        default "xilinx"
 
 config SYS_SOC
        default "zynq"
 
 config SYS_CONFIG_NAME
-       default "zynq_zed" if TARGET_ZYNQ_ZED
-       default "zynq_microzed" if TARGET_ZYNQ_MICROZED
-       default "zynq_picozed" if TARGET_ZYNQ_PICOZED
-       default "zynq_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706 \
-                               || TARGET_ZYNQ_ZC70X
-       default "zynq_zc770" if TARGET_ZYNQ_ZC770
-       default "zynq_zybo" if TARGET_ZYNQ_ZYBO
+       string "Board configuration name"
+       default "zynq-common"
+       help
+         This option contains information about board configuration name.
+         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
+         will be used for board configuration.
+
+config SYS_MALLOC_F_LEN
+       default 0x800
+
+config SYS_MALLOC_LEN
+       default 0x1400000
+
+config BOOT_INIT_FILE
+       string "boot.bin init register filename"
+       default ""
+       help
+         Add register writes to boot.bin format (max 256 pairs).
+         Expect a table of register-value pairs, e.g. "0x12345678 0x4321"
+
+config ZYNQ_SDHCI_MAX_FREQ
+       default 52000000
 
 endif