aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-23 17:05:49 -0400
committerJason Cooper <jason@lakedaemon.net>2014-07-24 19:14:36 -0400
commitce800342c80704e5efa4d6440f1c04c83a044499 (patch)
tree931bee2ab841a086fa26754f391668e8a79099d0 /arch/arm/mach-mvebu/Kconfig
parent54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 (diff)
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/Kconfig')
-rw-r--r--arch/arm/mach-mvebu/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 8e3b5f12cd7c..ae417607e108 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -16,11 +16,15 @@ if ARCH_MVEBU
16 16
17menu "Marvell EBU SoC variants" 17menu "Marvell EBU SoC variants"
18 18
19config MACH_MVEBU_ANY
20 bool
21
19config MACH_MVEBU_V7 22config MACH_MVEBU_V7
20 bool 23 bool
21 select ARMADA_370_XP_TIMER 24 select ARMADA_370_XP_TIMER
22 select CACHE_L2X0 25 select CACHE_L2X0
23 select ARM_CPU_SUSPEND 26 select ARM_CPU_SUSPEND
27 select MACH_MVEBU_ANY
24 28
25config MACH_ARMADA_370 29config MACH_ARMADA_370
26 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 30 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
@@ -77,6 +81,7 @@ config MACH_DOVE
77 select CACHE_L2X0 81 select CACHE_L2X0
78 select CPU_PJ4 82 select CPU_PJ4
79 select DOVE_CLK 83 select DOVE_CLK
84 select MACH_MVEBU_ANY
80 select ORION_IRQCHIP 85 select ORION_IRQCHIP
81 select ORION_TIMER 86 select ORION_TIMER
82 select PINCTRL_DOVE 87 select PINCTRL_DOVE
@@ -90,6 +95,7 @@ config MACH_KIRKWOOD
90 select ARCH_REQUIRE_GPIOLIB 95 select ARCH_REQUIRE_GPIOLIB
91 select CPU_FEROCEON 96 select CPU_FEROCEON
92 select KIRKWOOD_CLK 97 select KIRKWOOD_CLK
98 select MACH_MVEBU_ANY
93 select ORION_IRQCHIP 99 select ORION_IRQCHIP
94 select ORION_TIMER 100 select ORION_TIMER
95 select PCI 101 select PCI