X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-zynq%2FKconfig;h=d396a13b6f7c41d858a61ac0ffe16a669128b9d1;hb=312a6c016a2d81aa3fbc605f5c0c315b6a4e3464;hp=a4deddfc1ab6c860492f899d102093f7ab16c653;hpb=9bd53b625582555820d7bce5407ee8b56edc2160;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index a4deddfc1a..d396a13b6f 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,8 +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"
-	optional
+	default TARGET_ZYNQ_ZC702
 
 config TARGET_ZYNQ_ZED
 	bool "Zynq ZedBoard"
@@ -13,12 +21,6 @@ config TARGET_ZYNQ_MICROZED
 config TARGET_ZYNQ_PICOZED
 	bool "Zynq PicoZed"
 
-config TARGET_ZYNQ_ZC70X
-	bool "Zynq ZC702/ZC706 Board (deprecated)"
-	help
-	  This option is deprecated.  Use TARGET_ZYNQ_ZC702
-	  or TARGET_ZYNQ_706.
-
 config TARGET_ZYNQ_ZC702
 	bool "Zynq ZC702 Board"
 
@@ -27,6 +29,7 @@ config TARGET_ZYNQ_ZC706
 
 config TARGET_ZYNQ_ZC770
 	bool "Zynq ZC770 Board"
+	select ZYNQ_CUSTOM_INIT
 
 config TARGET_ZYNQ_ZYBO
 	bool "Zynq Zybo Board"
@@ -46,8 +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_ZC702 || TARGET_ZYNQ_ZC706 \
-			        || 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