From b127b52eb14682ea4c730a0cdadedad55b58cf52 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 31 Jul 2014 16:56:39 +0200 Subject: [PATCH] Allow ARMv6/ARM1176 to be selected for ARM Versatile PB. This kernel can be used to run Raspberry Pi images on QEMU platform. The concept and kernel configuration taken from http://xecdesign.com/compiling-a-kernel/ http://xecdesign.com/qemu-emulating-raspberry-pi-the-easy-way/ Signed-off-by: Pavel Pisa --- arch/arm/mach-versatile/Kconfig | 3 --- arch/arm/mm/Kconfig | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index 1dba3688275f96..d2659310f38af0 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -4,7 +4,6 @@ menu "Versatile platform type" config ARCH_VERSATILE_PB bool "Support Versatile Platform Baseboard for ARM926EJ-S" default y - select CPU_ARM926T select MIGHT_HAVE_PCI help Include support for the ARM(R) Versatile Platform Baseboard @@ -12,14 +11,12 @@ config ARCH_VERSATILE_PB config MACH_VERSATILE_AB bool "Support Versatile Application Baseboard for ARM926EJ-S" - select CPU_ARM926T help Include support for the ARM(R) Versatile Application Baseboard for the ARM926EJ-S. config MACH_VERSATILE_DT bool "Support Versatile platform from device tree" - select CPU_ARM926T select USE_OF help Include support for the ARM(R) Versatile/PB platform, diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4f31fbffbd7bf2..dc882bc586daba 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -71,7 +71,7 @@ config CPU_ARM9TDMI # ARM920T config CPU_ARM920T - bool "Support ARM920T processor" if ARCH_INTEGRATOR + bool "Support ARM920T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v4T select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -89,7 +89,7 @@ config CPU_ARM920T # ARM922T config CPU_ARM922T - bool "Support ARM922T processor" if ARCH_INTEGRATOR + bool "Support ARM922T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v4T select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -127,7 +127,7 @@ config CPU_ARM925T # ARM926T config CPU_ARM926T - bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB + bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v5 select CPU_ABRT_EV5TJ select CPU_CACHE_VIVT @@ -135,6 +135,7 @@ config CPU_ARM926T select CPU_CP15_MMU select CPU_PABRT_LEGACY select CPU_TLB_V4WBI if MMU + depends on !CPU_V6 && !CPU_V7 help This is a variant of the ARM920. It has slightly different instruction sequences for cache and TLB operations. Curiously, @@ -358,7 +359,7 @@ config CPU_PJ4B # ARMv6 config CPU_V6 - bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || MACH_BCM2708 + bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || MACH_BCM2708 || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6