Commit 572b16db authored Apr 30, 2013 by Arnd Bergmann

ARM: OMAP: build SMP code only for OMAP4/5



The OMAP platform code assumes that SMP is only ever enabled when
CONFIG_ARCH_OMAP4 or CONFIG_SOC_OMAP5 is enabled, which is not
necessarirly true in a multiplatform configuration.

arch/arm/mach-omap2/built-in.o: In function `omap4_smp_prepare_cpus':
 :(.init.text+0x413c): undefined reference to `omap_get_wakeupgen_base'
 :(.init.text+0x415c): undefined reference to `omap_secure_apis_support'
arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary':
 :(.cpuinit.text+0x28): undefined reference to `omap_get_wakeupgen_base'
 :(.cpuinit.text+0x3c): undefined reference to `omap_secure_apis_support'
arch/arm/mach-omap2/built-in.o: In function `omap4_cpu_die':
 :(.ref.text+0x8): undefined reference to `omap_get_wakeupgen_base'
 :(.ref.text+0x10): undefined reference to `omap_secure_apis_support'
 :(.ref.text+0x4c): undefined reference to `omap4_hotplug_cpu'
 :(.ref.text+0x50): undefined reference to `omap_secure_apis_support'

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>

parent 63cc8467

arch/arm/mach-omap2/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -32,12 +32,12 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o

		# SMP support ONLY available for OMAP4

		obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
		obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.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)
		obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common)
		obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y)
		obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y)

		plus_sec := $(call as-instr,.arch_extension sec,+sec)
		AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)