Merge branch 'next'

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

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 1046ece7845258abe93adf6bc17f66a715c6ab1c..d396a13b6f7c41d858a61ac0ffe16a669128b9d1 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,7 +1,16 @@
 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 TARGET_ZYNQ_ZED
        bool "Zynq ZedBoard"
@@ -12,11 +21,15 @@ config TARGET_ZYNQ_MICROZED
 config TARGET_ZYNQ_PICOZED
        bool "Zynq PicoZed"
 
-config TARGET_ZYNQ_ZC70X
-       bool "Zynq ZC702/ZC706 Board"
+config TARGET_ZYNQ_ZC702
+       bool "Zynq ZC702 Board"
+
+config TARGET_ZYNQ_ZC706
+       bool "Zynq ZC706 Board"
 
 config TARGET_ZYNQ_ZC770
        bool "Zynq ZC770 Board"
+       select ZYNQ_CUSTOM_INIT
 
 config TARGET_ZYNQ_ZYBO
        bool "Zynq Zybo Board"
@@ -36,7 +49,7 @@ 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_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706
        default "zynq_zc770" if TARGET_ZYNQ_ZC770
        default "zynq_zybo" if TARGET_ZYNQ_ZYBO