[meta-xilinx] [PATCHv2 2/2] u-boot-xlnx : Add support for building SPL for the zc702.

[Philip Balister]

On 10/23/2014 04:57 PM, Sören Brinkmann wrote:
> On Thu, 2014-10-23 at 04:49PM -0400, Philip Balister wrote:
>> The ps7_init files are GPL versions from:
>> https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/zynq_fsbl/misc/zc702
>>
>> I had to edit the .h filename in the .c file. Another option is use the
>> file names as is, but this needs a patch to u-boot so it looks for
>> ps7_init_gpl.c.
> 
> Internally I just created such a patch (below as reference). I think this is the
> better way.  But am still waiting for feedback.

I agree. Less file editing. But we need to get everything in sync, and
the version of u-boot meta-xilinx builds today uses ps7_init.c. When
this patch is upstream, and we change the u-boot recipe to build it,
when can change the name then.

Philip

> 
> 	Sören
> 
> ----------8<----------------8<-------------------8<-----------------8<----------
> Subject: [U-BOOT PATCH] 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 at xilinx.com>
> ---
>  board/xilinx/zynq/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
> index 6b8b093347bb..506b743f8fef 100644
> --- a/board/xilinx/zynq/Makefile
> +++ b/board/xilinx/zynq/Makefile
> @@ -8,9 +8,9 @@
>  obj-y	:= board.o
>  obj-$(CONFIG_THOR_FUNCTION) += thor.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
>