summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq/spl.c
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/spl.c
parent9bd53b625582555820d7bce5407ee8b56edc2160 (diff)
downloadtalos-obmc-uboot-95b237ecbced8ca120c37cc284c4b2feeec8ed57.tar.gz
talos-obmc-uboot-95b237ecbced8ca120c37cc284c4b2feeec8ed57.zip
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/spl.c')
-rw-r--r--arch/arm/mach-zynq/spl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 13025f034b..e7df6d3d7b 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -85,6 +85,6 @@ __weak void ps7_init(void)
{
/*
* This function is overridden by the one in
- * board/xilinx/zynq/ps7_init_gpl.c, if it exists.
+ * board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
*/
}
OpenPOWER on IntegriCloud