Skip to contentSkip to conversation

ARM: hisi: depend on ARCH_MULTI_V7

PATCH New Arnd Bergmann 2 participants 2 messages Sep 29, 2014 – Sep 30, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
I'd like to apply this patch directly to the arm-soc tree

arch/arm/mach-hisi/Kconfig +1 -1
index 075772b34e80..cd19433f76d3 100644
@@ -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
maintainer
#1 lore raw

PATCH 1/1 ARM: hisi: depend on ARCH_MULTI_V7

Quoted 13 lines · Arnd Bergmann

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'

Quoted 5 lines

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

---

Hi Arnd,

Quoted 1 line

I'd like to apply this patch directly to the arm-soc tree

Thanks!

Best Regards,
Wei

Quoted 16 lines
arch/arm/mach-hisi/Kconfig +1 -1
index 075772b34e80..cd19433f76d3 100644
@@ -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