diff options
| author | Tom Rini <trini@ti.com> | 2014-11-13 08:38:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-13 08:38:17 -0500 |
| commit | 3deb013ae780c19f40b0704a7f421ad479962618 (patch) | |
| tree | 18f8e2abed8a2c295b6157f286288621ee46226d /board/xilinx/zynq/Makefile | |
| parent | 01541eeccdf74ee68f9a3014b6cdc26395be4dc0 (diff) | |
| parent | 61eb3cf2d5ef174b5a3008df6f7530b21f393261 (diff) | |
| download | blackbird-obmc-uboot-3deb013ae780c19f40b0704a7f421ad479962618.tar.gz blackbird-obmc-uboot-3deb013ae780c19f40b0704a7f421ad479962618.zip | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'board/xilinx/zynq/Makefile')
| -rw-r--r-- | board/xilinx/zynq/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 71c0c351f9..3b1eb4f74a 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 |
