diff mbox

[U-Boot,v4] zynq: Use GPLed files for SPL

Message ID 1414691563-19813-1-git-send-email-soren.brinkmann@xilinx.com
State Accepted
Delegated to: Michal Simek
Headers show

Commit Message

Soren Brinkmann Oct. 30, 2014, 5:52 p.m. UTC 
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>
---
v4:
 - add ps7_init_gpl.[ch] to gitignore
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
---
 board/xilinx/zynq/.gitignore | 1 +
 board/xilinx/zynq/Makefile   | 6 ++++--
 board/xilinx/zynq/legacy.c   | 2 ++
 board/xilinx/zynq/xil_io.h   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 board/xilinx/zynq/legacy.c

Comments

Michal Simek Nov. 11, 2014, 10:06 a.m. UTC | #1 
On 10/30/2014 06:52 PM, Soren Brinkmann 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>
> Reviewed-and-tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Applied.

Michal
diff mbox

Patch

diff --git a/board/xilinx/zynq/.gitignore b/board/xilinx/zynq/.gitignore
index 68b8edd260d0..7c36bc963f7a 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 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.
  */