omap2/3: Multiboot compile fixes to compile in omap2 and omap3

[net-next-2.6.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 34c2867e0f6332d2f8bcbc76d676714359ec8b6e..f6f151c4f08984c88500ca8333bad39a827e1b6d 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -34,6 +34,10 @@ obj-$(CONFIG_ARCH_OMAP2420)          += sram242x.o
 obj-$(CONFIG_ARCH_OMAP2430)            += sram243x.o
 obj-$(CONFIG_ARCH_OMAP3)               += sram34xx.o
 
+AFLAGS_sram242x.o                      :=-Wa,-march=armv6
+AFLAGS_sram243x.o                      :=-Wa,-march=armv6
+AFLAGS_sram34xx.o                      :=-Wa,-march=armv7-a
+
 # Pin multiplexing
 obj-$(CONFIG_ARCH_OMAP3)               += mux34xx.o
 
@@ -47,6 +51,10 @@ obj-$(CONFIG_ARCH_OMAP2)             += pm24xx.o
 obj-$(CONFIG_ARCH_OMAP24XX)            += sleep24xx.o
 obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o cpuidle34xx.o
 obj-$(CONFIG_PM_DEBUG)                 += pm-debug.o
+
+AFLAGS_sleep24xx.o                     :=-Wa,-march=armv6
+AFLAGS_sleep34xx.o                     :=-Wa,-march=armv7-a
+
 endif
 
 # PRCM