diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-30 16:24:50 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-03 16:36:30 -0400 |
| commit | 572b16db7040ca606a35081c95f0d6ac0a435913 (patch) | |
| tree | f104d629b1315492fd35aa461a1cfbc357f7b6ce /arch/arm | |
| parent | 63cc846761306bfb539cd0adb9d577f28b753fd9 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b068b7fe99ef..302593fb76d2 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -32,12 +32,12 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o | |||
| 32 | 32 | ||
| 33 | # SMP support ONLY available for OMAP4 | 33 | # SMP support ONLY available for OMAP4 |
| 34 | 34 | ||
| 35 | obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o | 35 | smp-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o |
| 36 | obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o | 36 | smp-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o |
| 37 | omap-4-5-common = omap4-common.o omap-wakeupgen.o \ | 37 | omap-4-5-common = omap4-common.o omap-wakeupgen.o \ |
| 38 | sleep44xx.o | 38 | sleep44xx.o |
| 39 | obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) | 39 | obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y) |
| 40 | obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) | 40 | obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) |
| 41 | 41 | ||
| 42 | plus_sec := $(call as-instr,.arch_extension sec,+sec) | 42 | plus_sec := $(call as-instr,.arch_extension sec,+sec) |
| 43 | AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) | 43 | AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) |