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