sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

ARM: zynq: drop legacy ps7_init.c/h support 

We are about to change the location for ps7_init files, breaking the
current work-flows.  It is good time to drop the legacy ps7_init.c/h
support.

Going forward, please use ps7_init_gpl.c/h all the time.
If you are still using old Xilinx tools that are only able to
generate ps7_init.c/h, rename them into ps7_init_gpl.c/h.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Suggested-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Masahiro Yamada 2015-04-14 16:50:50 +09:00 committed by Michal Simek
parent 7a1aec8de8
commit e7fa7d5c73
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/zynq/spl.c
View File

@ -85,6 +85,6 @@ __weak void ps7_init(void)
{
/*
* This function is overridden by the one in
* board/xilinx/zynq/ps7_init.c, if it exists.
* board/xilinx/zynq/ps7_init_gpl.c, if it exists.
*/
}

1
board/xilinx/zynq/.gitignore vendored
View File

@ -1,2 +1 @@
ps7_init.[ch]
ps7_init_gpl.[ch]

4
board/xilinx/zynq/Makefile
View File

@ -9,9 +9,7 @@ obj-y := board.o
# Please copy ps7_init_gpl.c/h from hw project to this directory
obj-$(CONFIG_SPL_BUILD) += \
$(if $(wildcard $(srctree)/$(src)/ps7_init_gpl.c), ps7_init_gpl.o, \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o legacy.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_gpl.o := -Wstrict-prototypes
CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes

2
board/xilinx/zynq/legacy.c
View File

@ -1,2 +0,0 @@
#warning usage of ps7_init files is deprecated please use ps7_init_gpl