summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-30 12:53:19 (GMT)
committerArnd Bergmann <arnd@arndb.de>2013-05-02 20:47:21 (GMT)
commita94d236dc355f374857ee4e6e78b7dec8a0f29e3 (patch)
treeb3f6686bdb5d96fd3570b3f5bdfeee05d8edb173
parentb45e0ed41adee52c49c222e752495d69d7e57981 (diff)
downloadlinux-fsl-qoriq-a94d236dc355f374857ee4e6e78b7dec8a0f29e3.tar.xz
ARM: SPEAr: conditionalize SMP code
Some constant definitions are only defined for spear13xx, so we must not attempt to build SPEAr SMP support when that SoC is not enabled. arch/arm/mach-spear/platsmp.c:25:35: error: 'VA_SCU_BASE' undeclared here (not in a function) arch/arm/mach-spear/platsmp.c: In function 'spear13xx_smp_prepare_cpus': arch/arm/mach-spear/platsmp.c:111:58: error: 'SYS_LOCATION' undeclared (first use in this function) Cc: Viresh Kumar <viresh.linux@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-spear/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear/Makefile b/arch/arm/mach-spear/Makefile
index dc9ce80..8aaf724 100644
--- a/arch/arm/mach-spear/Makefile
+++ b/arch/arm/mach-spear/Makefile
@@ -7,10 +7,10 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
# Common support
obj-y := restart.o time.o
-obj-$(CONFIG_SMP) += headsmp.o platsmp.o
-obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
+smp-$(CONFIG_SMP) += headsmp.o platsmp.o
+smp-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o
+obj-$(CONFIG_ARCH_SPEAR13XX) += spear13xx.o $(smp-y)
obj-$(CONFIG_MACH_SPEAR1310) += spear1310.o
obj-$(CONFIG_MACH_SPEAR1340) += spear1340.o