summaryrefslogtreecommitdiff
path: root/arch/arm/mach-zynq/Kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-18 15:31:52 +0900
committerMichal Simek <michal.simek@xilinx.com>2015-05-25 10:52:36 +0200
commit95b237ecbced8ca120c37cc284c4b2feeec8ed57 (patch)
tree03fc8f716f00b173584f3f567ba5751345470557 /arch/arm/mach-zynq/Kconfig
parent9bd53b625582555820d7bce5407ee8b56edc2160 (diff)
ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x
Due to licensing issues, the files ps7_init.c/h are not able to be distributed with U-Boot source code. Recent Xilinx tools also provide the GPL variants (ps7_init_gpl.c/h), compatible with U-Boot license. Prior to this commit, we had to copy ps7_init files into board/xilinx/zynq/ before the compile. To be more user-friendly, let's include ps7_init_gpl.c/h for Zedboard, MicroZed, ZC702, ZC706. These init code have been taken from the hwplatform_templates directory of Xilinx SDK 2014.4. You can still use customized ps7_init_gpl.c/h by enabling CONFIG_ZYNQ_CUSTOM_INIT. The recommended directory for storing them is now board/xilinx/zynq/custom_hw_platform, but board/xilinx/zynq is still supported for backward compatibility. The latter emits a warning message to prompt users to gradually switch to the new directory. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq/Kconfig')
-rw-r--r--arch/arm/mach-zynq/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index a4deddfc1a..1de5b0710a 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,5 +1,13 @@
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
@@ -15,6 +23,7 @@ config TARGET_ZYNQ_PICOZED
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.
@@ -27,9 +36,11 @@ config TARGET_ZYNQ_ZC706
config TARGET_ZYNQ_ZC770
bool "Zynq ZC770 Board"
+ select ZYNQ_CUSTOM_INIT
config TARGET_ZYNQ_ZYBO
bool "Zynq Zybo Board"
+ select ZYNQ_CUSTOM_INIT
endchoice