]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 18 May 2015 06:31:52 +0000 (15:31 +0900)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 25 May 2015 08:52:36 +0000 (10:52 +0200)
commit95b237ecbced8ca120c37cc284c4b2feeec8ed57
tree03fc8f716f00b173584f3f567ba5751345470557
parent9bd53b625582555820d7bce5407ee8b56edc2160
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>
13 files changed:
arch/arm/mach-zynq/Kconfig
arch/arm/mach-zynq/spl.c
board/xilinx/zynq/.gitignore
board/xilinx/zynq/Makefile
board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.c [new file with mode: 0644]
board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.h [new file with mode: 0644]
board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.c [new file with mode: 0644]
board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.h [new file with mode: 0644]
board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.c [new file with mode: 0644]
board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.h [new file with mode: 0644]
board/xilinx/zynq/custom_hw_platform/.gitignore [new file with mode: 0644]
board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.c [new file with mode: 0644]
board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.h [new file with mode: 0644]