GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 21:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

zynq: Use GPLed files for SPL

Browse source 
The latest Xilinx tools generate ps7_init files that are explicitly
available under GPL. Change the makefile to allow drop in of those files
for building the SPL.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Reviewed-and-tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Soren Brinkmann 2014-10-30 10:52:43 -07:00 • committed by Michal Simek
parent 11ada9225a
commit 290f1f999a
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
board/xilinx/zynq/.gitignore vendored
View file

@ -1 +1,2 @@
ps7_init.[ch]
ps7_init_gpl.[ch]

6
board/xilinx/zynq/Makefile
View file

@ -7,9 +7,11 @@
obj-y := board.o
# Please copy ps7_init.c/h from hw project to this directory
# Please copy ps7_init_gpl.c/h from hw project to this directory
obj-$(CONFIG_SPL_BUILD) += \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o)
$(if $(wildcard $(srctree)/$(src)/ps7_init_gpl.c), ps7_init_gpl.o, \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o legacy.o))
# Suppress "warning: function declaration isn't a prototype"
CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes
CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes

2
board/xilinx/zynq/legacy.c Normal file
View file

@ -0,0 +1,2 @@
#warning usage of ps7_init files is deprecated please use ps7_init_gpl

2
board/xilinx/zynq/xil_io.h
View file

@ -6,7 +6,7 @@
#define XIL_IO_H
/*
* This empty file is here because ps7_init.c exported by hw project
* This empty file is here because ps7_init_gpl.c exported by hw project
* has #include "xil_io.h" line.
*/