X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=lib_arm%2FMakefile;h=4469361a8aca1a21ab541579fc251d330fd93f78;hb=f578a2da6770951239ad91ee9a1875fdc71dbe48;hp=3e0a5c7fe5445d7cec7567c40eba820548b02230;hpb=f93286397ed2a7084efb0362a43ee09f11702349;p=oweals%2Fu-boot.git

diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index 3e0a5c7fe5..4469361a8a 100644
--- a/lib_arm/Makefile
+++ b/lib_arm/Makefile
@@ -25,16 +25,28 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(ARCH).a
 
-SOBJS	= _ashldi3.o _ashrdi3.o _divsi3.o _modsi3.o _udivsi3.o _umodsi3.o
-
-COBJS	= armlinux.o board.o \
-	  cache.o div0.o
-
-SRCS 	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
+SOBJS-y	+= _ashldi3.o
+SOBJS-y	+= _ashrdi3.o
+SOBJS-y	+= _divsi3.o
+SOBJS-y	+= _modsi3.o
+SOBJS-y	+= _udivsi3.o
+SOBJS-y	+= _umodsi3.o
+
+COBJS-y	+= board.o
+COBJS-y	+= bootm.o
+COBJS-y	+= cache.o
+ifndef CONFIG_SYS_NO_CP15_CACHE
+COBJS-y	+= cache-cp15.o
+endif
+COBJS-y	+= div0.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= reset.o
+
+SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):	$(obj).depend $(OBJS)
-	$(AR) crv $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################