[U-Boot] [U-BOOT PATCH] zynq: Use GPLed files for SPL

Soren Brinkmann soren.brinkmann at xilinx.com
Mon Oct 27 19:17:42 CET 2014


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 at xilinx.com>
---
 board/xilinx/zynq/Makefile | 6 +++---
 board/xilinx/zynq/xil_io.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
index 71c0c351f929..f71b272e7e7c 100644
--- a/board/xilinx/zynq/Makefile
+++ b/board/xilinx/zynq/Makefile
@@ -7,9 +7,9 @@
 
 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)
 
 # Suppress "warning: function declaration isn't a prototype"
-CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes
+CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes
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.
  */
 
-- 
2.1.2.1.g5e69ed6



More information about the U-Boot mailing list