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