[U-Boot,U-BOOT] 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>
---
 board/xilinx/zynq/Makefile | 6 +++---
 board/xilinx/zynq/xil_io.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Please correct the subject prefix for next time.

On 27 October 2014 23:47, 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>
> ---
>  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.
>   */

Acked-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>

thanks!

Hi Soren,

2014-10-28 3:17 GMT+09:00 Soren Brinkmann <soren.brinkmann@xilinx.com>:
> 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>
> ---
>  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


This patch drops the backward portability right now, doesn't it?
If this patch is applied, those who are using ps7_init.c will suddenly
find U-Boot stop working.

Perhaps we have two options.

[1] We should support both ps7_init.c and ps7_init_gpl.c
until most of users switch over to the latest tool.

[2] If board/xilinx/zynq/ps7_init.c exists,
Makefile should display a message to suggest to
rename the ps7_init.c and/or update the Xilinx tool.