diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-05-18 15:31:52 +0900 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-05-25 10:52:36 +0200 |
| commit | 95b237ecbced8ca120c37cc284c4b2feeec8ed57 (patch) | |
| tree | 03fc8f716f00b173584f3f567ba5751345470557 /board/xilinx/zynq/Makefile | |
| parent | 9bd53b625582555820d7bce5407ee8b56edc2160 (diff) | |
| download | blackbird-obmc-uboot-95b237ecbced8ca120c37cc284c4b2feeec8ed57.tar.gz blackbird-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 'board/xilinx/zynq/Makefile')
| -rw-r--r-- | board/xilinx/zynq/Makefile | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 3979347d2e..20522fba50 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -7,13 +7,36 @@ obj-y := board.o -# Please copy ps7_init_gpl.c/h from hw project to this directory -obj-$(CONFIG_SPL_BUILD) += \ - $(if $(wildcard $(srctree)/$(src)/ps7_init_gpl.c), ps7_init_gpl.o) +# Copied from Xilinx SDK 2014.4 +hw-platform-$(CONFIG_TARGET_ZYNQ_ZED) := zed_hw_platform +hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED) := MicroZed_hw_platform +hw-platform-$(CONFIG_TARGET_ZYNQ_ZC702) := ZC702_hw_platform +hw-platform-$(CONFIG_TARGET_ZYNQ_ZC706) := ZC706_hw_platform +# If you want to use customized ps7_init_gpl.c/h, +# enable CONFIG_ZYNQ_CUSTOM_INIT and put them into custom_hw_platform/. +# This line must be placed at the bottom of the list because +# it takes precedence over the default ones. +hw-platform-$(CONFIG_ZYNQ_CUSTOM_INIT) := custom_hw_platform + +init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ + $(hw-platform-y)/ps7_init_gpl.o) + +ifeq ($(init-objs),) +ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),) +init-objs := ps7_init_gpl.o +$(if $(CONFIG_SPL_BUILD),\ +$(warning Put custom ps7_init_gpl.c/h to board/xilinx/zynq/custome_hw_platform/)) +endif +endif + +obj-$(CONFIG_SPL_BUILD) += $(init-objs) # Suppress "warning: function declaration isn't a prototype" CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes +# To include xil_io.h +CFLAGS_ps7_init_gpl.o := -I$(srctree)/$(src) + # Warn if CONFIG_TARGET_ZYNQ_ZC70X is enabled ifeq ($(CONFIG_TARGET_ZYNQ_ZC70X),y) ifeq ($(CONFIG_SPL_BUILD),y) |
