Skip to contentSkip to conversation

ARM: Kconfig: Do not force selection of ARCH_VEXPRESS by ARCH_MULTI_V7

PATCH Superseded Fabio Estevam 2 participants 2 messages Nov 20, 2012 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 ARM: Kconfig: Do not force selection of ARCH_VEXPRESS by ARCH_MULTI_V7

From: Fabio Estevam <[email protected]>

When building a kernel using imx_v6_v7_defconfig, it is not possible to unselect ARCH_VEXPRESS due to the fact that it is automatically selected by ARCH_MULTI_V7.

This is not good when someone wants to create a minimal kernel build, so let multi_v7_defconfig select ARCH_VEXPRESS instead.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/Kconfig                    |    1 -
 arch/arm/configs/multi_v7_defconfig |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +0 -1
index 14f8160..d40e9d3 100644
@@ -1000,7 +1000,6 @@ config ARCH_MULTI_V7
 	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
-	select ARCH_VEXPRESS
 	select CPU_V7
 
 config ARCH_MULTI_V6_V7
arch/arm/configs/multi_v7_defconfig +1 -0
index 159f75f..531c538 100644
@@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_SMP=y
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: Kconfig: Do not force selection of ARCH_VEXPRESS by ARCH_MULTI_V7

Quoted 31 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

When building a kernel using imx_v6_v7_defconfig, it is not possible to unselect ARCH_VEXPRESS due to the fact that it is automatically selected by ARCH_MULTI_V7.

This is not good when someone wants to create a minimal kernel build, so let multi_v7_defconfig select ARCH_VEXPRESS instead.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/Kconfig                    |    1 -
 arch/arm/configs/multi_v7_defconfig |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +0 -1
index 14f8160..d40e9d3 100644
@@ -1000,7 +1000,6 @@ config ARCH_MULTI_V7
 	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
-	select ARCH_VEXPRESS
 	select CPU_V7
 
 config ARCH_MULTI_V6_V7
arch/arm/configs/multi_v7_defconfig +0 -0
index 159f75f..531c538 100644

arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_370=y · line 12

Quoted 7 lines
arch/arm/configs/multi_v7_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_SMP=y

You also need at least the following or randconfig builds will break when no platform is selected.

Rob

arch/arm/Kconfig +1 -0
index ade7e92..629e886 100644
@@ -265,6 +265,7 @@ choice
 config ARCH_MULTIPLATFORM
 	bool "Allow multiple platforms to be selected"
 	depends on MMU
+	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARM_PATCH_PHYS_VIRT
 	select AUTO_ZRELADDR
 	select COMMON_CLK
arch/arm/kernel/vmlinux.lds.S +2 -0
index 36ff15b..10c984d 100644
@@ -311,4 +311,6 @@ SECTIONS
  * binutils is too old (for other reasons as well)
  */
 ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
+#ifndef CONFIG_ARCH_MULTIPLATFORM
 ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
+#endif