Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[oweals/u-boot.git] / board / integratorcp / Makefile

diff --git a/board/integratorcp/Makefile b/board/integratorcp/Makefile
index efafeb687c5eb163ea3faf13ae35eb877f5b38d7..92a1a07b03b7b3f70cc1a719e2eafecba979d52e 100644 (file)
--- a/board/integratorcp/Makefile
+++ b/board/integratorcp/Makefile
@@ -26,20 +26,20 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(BOARD).a
 
 COBJS  := integratorcp.o flash.o
-SOBJS  := lowlevel_init.o memsetup.o
+SOBJS  := lowlevel_init.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS) $(SOBJS)
-       $(AR) crv $@ $(OBJS) $(SOBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################