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>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 8e3b5f12cd7cc6cb51e0676cb57fd215c58a7033..ae417607e1081e74b61f2c12043f8489b7f25f83 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -16,11 +16,15 @@ if ARCH_MVEBU
 
 menu "Marvell EBU SoC variants"
 
+config MACH_MVEBU_ANY
+       bool
+
 config MACH_MVEBU_V7
        bool
        select ARMADA_370_XP_TIMER
        select CACHE_L2X0
        select ARM_CPU_SUSPEND
+       select MACH_MVEBU_ANY
 
 config MACH_ARMADA_370
        bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
@@ -77,6 +81,7 @@ config MACH_DOVE
        select CACHE_L2X0
        select CPU_PJ4
        select DOVE_CLK
+       select MACH_MVEBU_ANY
        select ORION_IRQCHIP
        select ORION_TIMER
        select PINCTRL_DOVE
@@ -90,6 +95,7 @@ config MACH_KIRKWOOD
        select ARCH_REQUIRE_GPIOLIB
        select CPU_FEROCEON
        select KIRKWOOD_CLK
+       select MACH_MVEBU_ANY
        select ORION_IRQCHIP
        select ORION_TIMER
        select PCI

diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index bc7689e530a4ea3f55c451fa36d57b58fba33877..e24136b42765f69384c3143732961c8975652cab 100644 (file)
--- 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