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

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

diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile
index 9f885ff2305787ff9886d10f2d7c8c6a2c22fcba..8faf34b87ec55e954355d820eda5bd3eefd2301e 100644 (file)
--- a/arch/arm/cpu/arm920t/Makefile
+++ b/arch/arm/cpu/arm920t/Makefile
@@ -8,6 +8,13 @@
 extra-y        = start.o
 
 obj-y  += cpu.o
-obj-$(CONFIG_USE_IRQ)  += interrupts.o
 
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_EP93XX) += ep93xx/
+obj-$(CONFIG_IMX) += imx/
+obj-$(CONFIG_S3C24X0) += s3c24x0/
+
+# some files can only build in ARM mode
+
+ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD
+CFLAGS_cpu.o := -marm
+endif