ARM: OMAP2+: AM43x: resolve SMP related build error
authorMohammed, Afzal <afzal@ti.com>
Mon, 24 Jun 2013 08:13:45 +0000 (08:13 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 24 Jun 2013 14:11:21 +0000 (16:11 +0200)
If AM43x and SMP is selected, OMAP4 & OMAP5 deselected, build error as
follows,

arch/arm/mach-omap2/built-in.o: In function `scu_gp_set':
arch/arm/mach-omap2/sleep44xx.S:131: undefined reference to `omap4_get_scu_base'
arch/arm/mach-omap2/sleep44xx.S:132: undefined reference to `scu_power_mode'
arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear':
arch/arm/mach-omap2/sleep44xx.S:227: undefined reference to `omap4_get_scu_base'
arch/arm/mach-omap2/sleep44xx.S:229: undefined reference to `scu_power_mode'

Resolve it by building sleep44xx.S only for OMAP4 & OMAP5.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-omap2/Makefile

index ec2e128074d8a9e9a5b8afb4156d30162cf09fcc..abf2eff81fa9bcfc0b34af5670e274610c35486a 100644 (file)
@@ -35,10 +35,9 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)     += sdrc.o
 
 smp-$(CONFIG_SMP)                      += omap-smp.o omap-headsmp.o
 smp-$(CONFIG_HOTPLUG_CPU)              += omap-hotplug.o
-omap-4-5-common                                =  omap4-common.o omap-wakeupgen.o \
-                                          sleep44xx.o
-obj-$(CONFIG_ARCH_OMAP4)               += $(omap-4-5-common) $(smp-y)
-obj-$(CONFIG_SOC_OMAP5)                        += $(omap-4-5-common) $(smp-y)
+omap-4-5-common                                =  omap4-common.o omap-wakeupgen.o
+obj-$(CONFIG_ARCH_OMAP4)               += $(omap-4-5-common) $(smp-y) sleep44xx.o
+obj-$(CONFIG_SOC_OMAP5)                        += $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_AM43XX)               += $(omap-4-5-common)
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)