Merge branch 'devel-dma' into omap-for-linus

[~andy/linux] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index d43bd33a19be9a41ab2f80d776f6bcfc87c325bd..cdfb5faaec9daf36288241537b856ed7ac65492d 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -4,7 +4,7 @@
 
 # Common support
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
-        common.o
+        common.o gpio.o dma.o
 
 omap-2-3-common                                = irq.o sdrc.o prm2xxx_3xxx.o
 hwmod-common                           = omap_hwmod.o \
@@ -26,8 +26,9 @@ obj-$(CONFIG_LOCAL_TIMERS)            += timer-mpu.o
 obj-$(CONFIG_HOTPLUG_CPU)              += omap-hotplug.o
 obj-$(CONFIG_ARCH_OMAP4)               += omap44xx-smc.o omap4-common.o
 
-AFLAGS_omap-headsmp.o                  :=-Wa,-march=armv7-a
-AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
+AFLAGS_omap-headsmp.o                  :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a$(plus_sec)
 
 # Functions loaded to SRAM
 obj-$(CONFIG_ARCH_OMAP2420)            += sram242x.o
@@ -42,6 +43,7 @@ AFLAGS_sram34xx.o                     :=-Wa,-march=armv7-a
 obj-$(CONFIG_ARCH_OMAP2420)            += mux2420.o
 obj-$(CONFIG_ARCH_OMAP2430)            += mux2430.o
 obj-$(CONFIG_ARCH_OMAP3)               += mux34xx.o
+obj-$(CONFIG_ARCH_OMAP4)               += mux44xx.o
 
 # SMS/SDRC
 obj-$(CONFIG_ARCH_OMAP2)               += sdrc2xxx.o
@@ -139,8 +141,11 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)            += board-3430sdp.o \
                                           hsmmc.o \
                                           board-flash.o
 obj-$(CONFIG_MACH_NOKIA_N8X0)          += board-n8x0.o
+obj-$(CONFIG_MACH_NOKIA_RM680)         += board-rm680.o \
+                                          sdram-nokia.o \
+                                          hsmmc.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
-                                          board-rx51-sdram.o \
+                                          sdram-nokia.o \
                                           board-rx51-peripherals.o \
                                           board-rx51-video.o \
                                           hsmmc.o