summary refs log tree commit diff
path: root/arch/arm/mach-hisi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-09-29 17:46:15 +0200
committerArnd Bergmann <arnd@arndb.de>2014-10-02 16:40:10 +0200
commitd8f0faa339b0beff6e055218e10b2982422db540 (patch)
tree3329f06113b75d7a00d13e64e869fcd457bc8673 /arch/arm/mach-hisi
parentc3ca2130c81bd24022586e2bdebefaffcaaf04a8 (diff)
downloadlinux-d8f0faa339b0beff6e055218e10b2982422db540.tar.gz
ARM: hisi: depend on ARCH_MULTI_V7
hisi has a general dependency on ARCH_MULTIPLATFORM, which is
problematic when building a kernel for non-V7 platforms but selecting
drivers that might conflict with other architecture levels.

In this case, it broke my (still out of tree) patch set that
enables V7M multiplatform support, since that does not enable
MULTI_IRQ support:

arch/arm/kernel/built-in.o: In function `set_handle_irq':
arch/arm/kernel/irq.c:125: undefined reference to `handle_arch_irq'
arch/arm/kernel/built-in.o: In function `setup_arch':
arch/arm/kernel/setup.c:965: undefined reference to `handle_arch_irq'

Since all hisilicon platforms are ARMv7 based, we can avoid this
problem by just making the dependency more specific.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
Diffstat (limited to 'arch/arm/mach-hisi')
-rw-r--r--arch/arm/mach-hisi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 075772b34e80..cd19433f76d3 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -1,6 +1,6 @@
 config ARCH_HISI
 	bool "Hisilicon SoC Support"
-	depends on ARCH_MULTIPLATFORM
+	depends on ARCH_MULTI_V7
 	select ARM_AMBA
 	select ARM_GIC
 	select ARM_TIMER_SP804