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 b32678b848bc8d3a838cdae59059bae230ec3ea7..f6f151c4f08984c88500ca8333bad39a827e1b6d 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -6,14 +6,22 @@
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o
 
 omap-2-3-common                                = irq.o sdrc.o omap_hwmod.o
-omap-3-4-common                                = dpll.o
+omap-3-4-common                                = dpll3xxx.o
 prcm-common                            = prcm.o powerdomain.o
-clock-common                           = clock.o clock_common_data.o clockdomain.o
-
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common)
+clock-common                           = clock.o clock_common_data.o \
+                                         clockdomain.o clkt_dpll.o \
+                                         clkt_clksel.o
+clock-omap2xxx                         = clkt2xxx_dpllcore.o \
+                                         clkt2xxx_virt_prcm_set.o \
+                                         clkt2xxx_apll.o clkt2xxx_osc.o \
+                                         clkt2xxx_sys.o
+clock-omap3xxx                         = clkt34xx_dpll3m2.o
+
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) \
+                           $(clock-omap2xxx)
 obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common) \
-                           $(omap-3-4-common)
-obj-$(CONFIG_ARCH_OMAP4) += $(omap-3-4-common) prcm.o clock.o
+                           $(omap-3-4-common) $(clock-omap3xxx)
+obj-$(CONFIG_ARCH_OMAP4) += $(omap-3-4-common) $(prcm-common) $(clock-common)
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
@@ -26,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
 
@@ -39,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