summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-23 23:05:49 +0200
committerJason Cooper <jason@lakedaemon.net>2014-07-25 01:14:36 +0200
commitce800342c80704e5efa4d6440f1c04c83a044499 (patch)
tree931bee2ab841a086fa26754f391668e8a79099d0 /arch/arm/mach-mvebu/Makefile
parentMerge branch 'mvebu/soc-cpuidle' into mvebu/soc (diff)
downloadlinux-ce800342c80704e5efa4d6440f1c04c83a044499.tar.xz
linux-ce800342c80704e5efa4d6440f1c04c83a044499.zip
ARM: mvebu: fix build without platforms selected
When building a multiplatform kernel that enables 'ARCH_MVEBU' but none of the individual options under it, we get this link error: arch/arm/mach-mvebu/built-in.o: In function `mvebu_armada375_smp_wa_init': :(.text+0x190): undefined reference to `mvebu_setup_boot_addr_wa' The best solution seems to be to ensure that in this configuration, we don't actually build any of the mvebu code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lkml.kernel.org/r/7339332.ZE2mWIdyDh@wuerfel Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r--arch/arm/mach-mvebu/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index bc7689e530a4..e24136b42765 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -4,7 +4,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
CFLAGS_pmsu.o := -march=armv7-a
-obj-y += system-controller.o mvebu-soc-id.o
+obj-$(CONFIG_MACH_MVEBU_ANY) += system-controller.o mvebu-soc-id.o
ifeq ($(CONFIG_MACH_MVEBU_V7),y)
obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o