Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / board / xilinx / zynq / Makefile

diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
index 98a5046f4558165af054fdb6abecdff35d2baaca..fd5d6fe950c7c9aaa420aa85520df27fbd8de167 100644 (file)
--- a/board/xilinx/zynq/Makefile
+++ b/board/xilinx/zynq/Makefile
@@ -5,31 +5,44 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
-
-LIB    = $(obj)lib$(BOARD).o
-
-COBJS-y        := board.o
-
-COBJS  := $(sort $(COBJS-y))
-
-SRCS   := $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-
-$(LIB):        $(obj).depend $(OBJS)
-       $(call cmd_link_o_target, $(OBJS))
-
-clean:
-       rm -f $(OBJS)
-
-distclean:     clean
-       rm -f $(LIB) core *.bak $(obj).depend
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y  := board.o
+
+# Copied from Xilinx SDK 2014.4
+hw-platform-$(CONFIG_TARGET_ZYNQ_ZED)          := zed_hw_platform
+hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED)     := MicroZed_hw_platform
+hw-platform-$(CONFIG_TARGET_ZYNQ_ZC702)                := ZC702_hw_platform
+hw-platform-$(CONFIG_TARGET_ZYNQ_ZC706)                := ZC706_hw_platform
+# If you want to use customized ps7_init_gpl.c/h,
+# enable CONFIG_ZYNQ_CUSTOM_INIT and put them into custom_hw_platform/.
+# This line must be placed at the bottom of the list because
+# it takes precedence over the default ones.
+hw-platform-$(CONFIG_ZYNQ_CUSTOM_INIT)         := custom_hw_platform
+
+init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
+       $(hw-platform-y)/ps7_init_gpl.o)
+
+ifeq ($(init-objs),)
+ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
+init-objs := ps7_init_gpl.o
+$(if $(CONFIG_SPL_BUILD),\
+$(warning Put custom ps7_init_gpl.c/h to board/xilinx/zynq/custom_hw_platform/))
+endif
+endif
+
+obj-$(CONFIG_SPL_BUILD) += $(init-objs)
+
+# Suppress "warning: function declaration isn't a prototype"
+CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes
+
+# To include xil_io.h
+CFLAGS_ps7_init_gpl.o := -I$(srctree)/$(src)
+
+# Warn if CONFIG_TARGET_ZYNQ_ZC70X is enabled
+ifeq ($(CONFIG_TARGET_ZYNQ_ZC70X),y)
+ifeq ($(CONFIG_SPL_BUILD),y)
+$(warning CONFIG_TARGET_ZYNQ_ZC70X is deprecated.)
+$(warning Enable CONFIG_TARGET_ZYNQ_ZC702 or CONFIG_TARGET_ZYNQ_706 instead.)
+$(warning "make zynq_zc70x_defconfig" is also deprecated.)
+$(warning Use "make zynq_zc702_defconfig" or "make zynq_zc706_defconfig".)
+endif
+endif