Merge branch 'master' into u-boot-5329-early

[oweals/u-boot.git] / cpu / mpc86xx / Makefile

diff --git a/cpu/mpc86xx/Makefile b/cpu/mpc86xx/Makefile
index ab6255a7dfdba47a6e2fe5bdcfa4334e1980cfe3..fffcfd24029fbdea9f5f8150fdcc68189be22683 100644 (file)
--- a/cpu/mpc86xx/Makefile
+++ b/cpu/mpc86xx/Makefile
@@ -25,24 +25,27 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(CPU).a
+LIB    = $(obj)lib$(CPU).a
 
 START  = start.o #resetvec.o
-ASOBJS  = cache.o 
+SOBJS  = cache.o
 COBJS  = traps.o cpu.o cpu_init.o speed.o interrupts.o \
-         pci.o i2c.o spd_sdram.o
-OBJS   = $(COBJS)
+         pci.o pcie_indirect.o spd_sdram.o
 
-all:   .depend $(START) $(ASOBJS) $(LIB)
+SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+START  := $(addprefix $(obj),$(START))
+
+all:   $(obj).depend $(START) $(LIB)
 
 $(LIB):        $(OBJS)
-       $(AR) crv $@ $(ASOBJS) $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(ASOBJS) $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(START:.o=.S) $(ASOBJS:.o=.S) $(COBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(START:.o=.S) $(ASOBJS:.o=.S) $(COBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################