Message ID | 1414650388-28156-1-git-send-email-soren.brinkmann@xilinx.com |
---|---|
State | Superseded |
Headers | show |
Hi Soren, On Wed, 29 Oct 2014 23:26:28 -0700 Soren Brinkmann <soren.brinkmann@xilinx.com> wrote: > 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> > --- > v3: > - handle the case with ps7_init and ps7_init_gpl files being present > v2: > - keep support for legacy file names > - issue compiler warning when legacy files are used > --- Please update board/xilinx/zynq/.gitignore to ignore ps7_init_gpl.[ch] too. Assuming you will do that, this patch looks good. (tested on ZC706 board) Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Best Regards Masahiro Yamada
diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 71c0c351f929..3b1eb4f74ad1 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 000000000000..4ae913eefeb3 --- /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 e59a977eb174..1eccf8d91d09 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. */