Merge branch 'karo-tx-uboot' into kc-merge

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

diff --git a/arch/arm/cpu/armv7/omap4/Makefile b/arch/arm/cpu/armv7/omap4/Makefile
index fc6e2ddd0a81842d09e5fad9abcef6d3536fba26..76a032a2d96684048170533a7b3f4327ec42f520 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/Makefile
+++ b/arch/arm/cpu/armv7/omap4/Makefile
@@ -5,29 +5,8 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
-
-LIB    =  $(obj)lib$(SOC).o
-
-COBJS  += sdram_elpida.o
-COBJS  += hwinit.o
-COBJS  += emif.o
-COBJS  += prcm-regs.o
-COBJS  += hw_data.o
-
-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  += sdram_elpida.o
+obj-y  += hwinit.o
+obj-y  += emif.o
+obj-y  += prcm-regs.o
+obj-y  += hw_data.o