diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-10-30 10:52:43 -0700 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-11-11 10:51:43 +0100 |
| commit | 290f1f999a42fd08f3483722a61e2d9e0901eb17 (patch) | |
| tree | e1658ee4573d2d7e49cacc58bf7bab0139647a11 | |
| parent | 11ada9225a16ed2d8ddbf0715a2416245a777cbc (diff) | |
| download | u-boot-imx-290f1f999a42fd08f3483722a61e2d9e0901eb17.zip u-boot-imx-290f1f999a42fd08f3483722a61e2d9e0901eb17.tar.gz u-boot-imx-290f1f999a42fd08f3483722a61e2d9e0901eb17.tar.bz2 | |
zynq: Use GPLed files for SPL
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>
| -rw-r--r-- | board/xilinx/zynq/.gitignore | 1 | ||||
| -rw-r--r-- | board/xilinx/zynq/Makefile | 6 | ||||
| -rw-r--r-- | board/xilinx/zynq/legacy.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynq/xil_io.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/board/xilinx/zynq/.gitignore b/board/xilinx/zynq/.gitignore index 68b8edd..7c36bc9 100644 --- a/board/xilinx/zynq/.gitignore +++ b/board/xilinx/zynq/.gitignore @@ -1 +1,2 @@ ps7_init.[ch] +ps7_init_gpl.[ch] diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 71c0c35..3b1eb4f 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -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 diff --git a/board/xilinx/zynq/legacy.c b/board/xilinx/zynq/legacy.c new file mode 100644 index 0000000..4ae913e --- /dev/null +++ b/board/xilinx/zynq/legacy.c @@ -0,0 +1,2 @@ + +#warning usage of ps7_init files is deprecated please use ps7_init_gpl diff --git a/board/xilinx/zynq/xil_io.h b/board/xilinx/zynq/xil_io.h index e59a977..1eccf8d 100644 --- a/board/xilinx/zynq/xil_io.h +++ b/board/xilinx/zynq/xil_io.h @@ -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. */ |