Merge branch 'next'

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / socfpga / Makefile

diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/cpu/armv7/socfpga/Makefile
index 3b48ac9b2b275f9a6059a5f4e4c06bfedeb843ba..cbe1d406df42002d453554a916dbbcbff3d3a9fc 100644 (file)
--- a/arch/arm/cpu/armv7/socfpga/Makefile
+++ b/arch/arm/cpu/armv7/socfpga/Makefile
@@ -7,29 +7,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-
-include $(TOPDIR)/config.mk
-
-LIB    =  $(obj)lib$(SOC).o
-
-SOBJS  := lowlevel_init.o
-COBJS-y        := misc.o timer.o
-COBJS-$(CONFIG_SPL_BUILD) += spl.o
-
-COBJS  := $(COBJS-y)
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS) $(SOBJS))
-
-all:    $(obj).depend $(LIB)
-
-$(LIB):        $(OBJS)
-       $(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y  := lowlevel_init.o
+obj-y  += misc.o timer.o reset_manager.o system_manager.o clock_manager.o
+obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o