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

[u-boot] / arch / arm / mach-zynq / Kconfig

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 483c3a07fa86c16675af5e8f6183da6649cb7713..a1175eea6ebb432ec2eb440e5f1caf6be78db1a1 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,28 +1,28 @@
 if ARCH_ZYNQ
 
-choice
-       prompt "Xilinx Zynq board select"
-       optional
+config SPL_FAT_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZED
-       bool "Zynq ZedBoard"
+config SPL_LIBCOMMON_SUPPORT
+       default y
 
-config TARGET_ZYNQ_MICROZED
-       bool "Zynq MicroZed"
+config SPL_LIBDISK_SUPPORT
+       default y
 
-config TARGET_ZYNQ_PICOZED
-       bool "Zynq PicoZed"
+config SPL_LIBGENERIC_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZC70X
-       bool "Zynq ZC702/ZC706 Board"
+config SPL_MMC_SUPPORT
+       default y if ZYNQ_SDHCI
 
-config TARGET_ZYNQ_ZC770
-       bool "Zynq ZC770 Board"
+config SPL_SERIAL_SUPPORT
+       default y
 
-config TARGET_ZYNQ_ZYBO
-       bool "Zynq Zybo Board"
+config SPL_SPI_FLASH_SUPPORT
+       default y if ZYNQ_QSPI
 
-endchoice
+config SPL_SPI_SUPPORT
+       default y if ZYNQ_QSPI
 
 config SYS_BOARD
        default "zynq"
@@ -34,11 +34,14 @@ 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_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 0x600
 
 endif