wok annotate linux/stuff/arm/linux-arm.patch @ rev 13077

Up: fuse to 2.8.7.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Jun 25 08:53:28 2012 +0000 (2012-06-25)
parents
children
rev   line source
pankso@12824 1 Make the "Arm Versatile" board even more versatile, for QEMU, which can
pankso@12824 2 stick weird processors into things that were never rmeant to receive them.
pankso@12824 3
pankso@12824 4 diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
pankso@12824 5 index 9cdec5a..59bf255 100644
pankso@12824 6 --- a/arch/arm/mach-versatile/Kconfig
pankso@12824 7 +++ b/arch/arm/mach-versatile/Kconfig
pankso@12824 8 @@ -3,7 +3,6 @@ menu "Versatile platform type"
pankso@12824 9
pankso@12824 10 config ARCH_VERSATILE_PB
pankso@12824 11 bool "Support Versatile Platform Baseboard for ARM926EJ-S"
pankso@12824 12 - select CPU_ARM926T
pankso@12824 13 select MIGHT_HAVE_PCI
pankso@12824 14 default y
pankso@12824 15 help
pankso@12824 16 @@ -12,7 +11,6 @@ config ARCH_VERSATILE_PB
pankso@12824 17
pankso@12824 18 config MACH_VERSATILE_AB
pankso@12824 19 bool "Support Versatile Application Baseboard for ARM926EJ-S"
pankso@12824 20 - select CPU_ARM926T
pankso@12824 21 help
pankso@12824 22 Include support for the ARM(R) Versatile Application Baseboard
pankso@12824 23 for the ARM926EJ-S.
pankso@12824 24 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
pankso@12824 25 index 0074b8d..608adb9 100644
pankso@12824 26 --- a/arch/arm/mm/Kconfig
pankso@12824 27 +++ b/arch/arm/mm/Kconfig
pankso@12824 28 @@ -107,7 +107,7 @@ config CPU_ARM9TDMI
pankso@12824 29
pankso@12824 30 # ARM920T
pankso@12824 31 config CPU_ARM920T
pankso@12824 32 - bool "Support ARM920T processor" if ARCH_INTEGRATOR
pankso@12824 33 + bool "Support ARM920T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
pankso@12824 34 select CPU_32v4T
pankso@12824 35 select CPU_ABRT_EV4T
pankso@12824 36 select CPU_PABRT_LEGACY
pankso@12824 37 @@ -125,7 +125,7 @@ config CPU_ARM920T
pankso@12824 38
pankso@12824 39 # ARM922T
pankso@12824 40 config CPU_ARM922T
pankso@12824 41 - bool "Support ARM922T processor" if ARCH_INTEGRATOR
pankso@12824 42 + bool "Support ARM922T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
pankso@12824 43 select CPU_32v4T
pankso@12824 44 select CPU_ABRT_EV4T
pankso@12824 45 select CPU_PABRT_LEGACY
pankso@12824 46 @@ -163,7 +163,7 @@ config CPU_ARM925T
pankso@12824 47
pankso@12824 48 # ARM926T
pankso@12824 49 config CPU_ARM926T
pankso@12824 50 - bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
pankso@12824 51 + bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
pankso@12824 52 select CPU_32v5
pankso@12824 53 select CPU_ABRT_EV5TJ
pankso@12824 54 select CPU_PABRT_LEGACY
pankso@12824 55 @@ -171,6 +171,7 @@ config CPU_ARM926T
pankso@12824 56 select CPU_CP15_MMU
pankso@12824 57 select CPU_COPY_V4WB if MMU
pankso@12824 58 select CPU_TLB_V4WBI if MMU
pankso@12824 59 + depends on !CPU_V6 && !CPU_V7
pankso@12824 60 help
pankso@12824 61 This is a variant of the ARM920. It has slightly different
pankso@12824 62 instruction sequences for cache and TLB operations. Curiously,
pankso@12824 63 @@ -390,7 +391,8 @@ config CPU_PJ4
pankso@12824 64
pankso@12824 65 # ARMv6
pankso@12824 66 config CPU_V6
pankso@12824 67 - bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
pankso@12824 68 + bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
pankso@12824 69 +
pankso@12824 70 select CPU_32v6
pankso@12824 71 select CPU_ABRT_EV6
pankso@12824 72 select CPU_PABRT_V6