diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-04 07:23:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-04 07:23:32 -0400 |
| commit | fe84c48eeb8e9cb0b8b80a4c0a53bb089adff9af (patch) | |
| tree | 7b3d2b47abc9b9f11f0e79a591f590050912c68a /board/xilinx/zynqmp/Makefile | |
| parent | 217324b23c4a73420633068efcdc396682894b1b (diff) | |
| parent | df1cd46fb84922735e1c12f54b7202b0268dcddd (diff) | |
| download | u-boot-fe84c48eeb8e9cb0b8b80a4c0a53bb089adff9af.tar.gz | |
Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2017.09
Zynq:
- Add Z-Turn board support
fpga:
- Remove intermediate buffer from code
Zynqmp:
- dts cleanup
- change psu_init handling
- Add options to get silicon version
- Fix time handling
- Map OCM/TCM via MMU
- Add new clock driver
Diffstat (limited to 'board/xilinx/zynqmp/Makefile')
| -rw-r--r-- | board/xilinx/zynqmp/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 9d69d6546e..75aab92f04 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -20,7 +20,11 @@ $(warning Put custom psu_init_gpl.c/h to board/xilinx/zynqmp/custom_hw_platform/ endif endif -obj-$(CONFIG_SPL_BUILD) += $(init-objs) +ifdef_any_of = $(filter-out undefined,$(foreach v,$(1),$(origin $(v)))) + +ifneq ($(call ifdef_any_of, CONFIG_ZYNQMP_PSU_INIT_ENABLED CONFIG_SPL_BUILD),) +obj-y += $(init-objs) +endif # Suppress "warning: function declaration isn't a prototype" CFLAGS_REMOVE_psu_init_gpl.o := -Wstrict-prototypes |