Merge branch 'master' of git://www.denx.de/git/u-boot-video

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

diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile
index bbc50844e0ffe2473a2b069a3352ed2d10230f9c..adbc585827ab22fe6fdce611e0aef60222955467 100644 (file)
--- a/cpu/mpc85xx/Makefile
+++ b/cpu/mpc85xx/Makefile
@@ -29,8 +29,13 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(CPU).a
 
 START  = start.o resetvec.o
-COBJS  = traps.o cpu.o cpu_init.o speed.o interrupts.o \
-         pci.o serial_scc.o commproc.o ether_fcc.o i2c.o spd_sdram.o
+SOBJS-$(CONFIG_MP) += release.o
+SOBJS  = $(SOBJS-y)
+COBJS-$(CONFIG_MP) += mp.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS  = traps.o cpu.o cpu_init.o speed.o interrupts.o tlb.o \
+         pci.o serial_scc.o commproc.o ether_fcc.o spd_sdram.o qe_io.o \
+         $(COBJS-y)
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -39,7 +44,7 @@ START := $(addprefix $(obj),$(START))
 all:   $(obj).depend $(START) $(LIB)
 
 $(LIB):        $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################