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

[u-boot] / arch / arm / cpu / pxa / Makefile

diff --git a/arch/arm/cpu/pxa/Makefile b/arch/arm/cpu/pxa/Makefile
index e8b59a30c9b0b9c29dae1aa6741e6e96d10ffb52..e08883256064622d0642cec0915d54cc3bb7b77f 100644 (file)
--- a/arch/arm/cpu/pxa/Makefile
+++ b/arch/arm/cpu/pxa/Makefile
@@ -27,7 +27,12 @@ LIB  = $(obj)lib$(CPU).o
 
 START  = start.o
 
-COBJS  += cpu.o
+COBJS-$(CONFIG_CPU_PXA25X)     = pxa2xx.o
+COBJS-$(CONFIG_CPU_PXA27X)     = pxa2xx.o
+
+COBJS-y        += cpuinfo.o
+
+COBJS  = $(COBJS-y)
 COBJS  += pxafb.o
 COBJS  += timer.o
 COBJS  += usb.o