@@ -329,6 +329,10 @@ config ARCH_MULTIPLATFORM
select SPARSE_IRQ
select USE_OF
+config ARM_SINGLE_INTEGRATOR
+ bool "ARM Ltd. Integrator family (noMMU)"
+ depends on !MMU
+
config ARCH_REALVIEW
bool "ARM Ltd. RealView family"
select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -1,8 +1,7 @@
config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)
+ default y if ARM_SINGLE_INTEGRATOR
select ARM_AMBA
- select ARM_PATCH_PHYS_VIRT if MMU
- select AUTO_ZRELADDR
select COMMON_CLK
select COMMON_CLK_VERSATILE
select GENERIC_CLOCKEVENTS
Allow Integrator to be selected from the top level choice table again for noMMU builds. The Integrator platform can have ARM940 and ARM946 CPU tiles attached, which are MPU-based CPUs, and the recent conversion of Integrator overlooked these. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/Kconfig | 4 ++++ arch/arm/mach-integrator/Kconfig | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)