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

[karo-tx-uboot.git] / arch / arm / cpu / pxa / Makefile

diff --git a/arch/arm/cpu/pxa/Makefile b/arch/arm/cpu/pxa/Makefile
index 49a6ed3c74d73ff5085c1b62a8eceaeaa260b393..e08883256064622d0642cec0915d54cc3bb7b77f 100644 (file)
--- a/arch/arm/cpu/pxa/Makefile
+++ b/arch/arm/cpu/pxa/Makefile
@@ -27,8 +27,12 @@ LIB  = $(obj)lib$(CPU).o
 
 START  = start.o
 
-COBJS  += cpu.o
-COBJS  += i2c.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