aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:46 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:26:55 -0500
commit56213ca4e440c0b6e56a48f5901c55c4ce3cf1ba (patch)
tree7047bf0972fc65e7f32b873a9919398660ef12c3 /arch/arm/mach-omap2/Makefile
parent9556175183ddf19e9a7afa449c259a0a5081fa29 (diff)
omap2/3: Multiboot compile fixes to compile in omap2 and omap3
Allows compiling in omap2 and omap3. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 34c2867e0f63..f6f151c4f089 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -34,6 +34,10 @@ obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
34obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o 34obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o
35obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o 35obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o
36 36
37AFLAGS_sram242x.o :=-Wa,-march=armv6
38AFLAGS_sram243x.o :=-Wa,-march=armv6
39AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
40
37# Pin multiplexing 41# Pin multiplexing
38obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o 42obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
39 43
@@ -47,6 +51,10 @@ obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
47obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o 51obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o
48obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o 52obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o
49obj-$(CONFIG_PM_DEBUG) += pm-debug.o 53obj-$(CONFIG_PM_DEBUG) += pm-debug.o
54
55AFLAGS_sleep24xx.o :=-Wa,-march=armv6
56AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a
57
50endif 58endif
51 59
52# PRCM 60# PRCM