Wed Jun 12 07:12:10 2013 UTC ()
Add CPU_ARMV7 and make CPU_PJ4B and CPU_CORTEX instantiate it.


(matt)
diff -r1.117 -r1.118 src/sys/arch/arm/conf/files.arm
cvs diff -r1.117 -r1.118 src/sys/arch/arm/conf/files.arm (switch to unified diff)

--- src/sys/arch/arm/conf/files.arm 2013/05/19 15:51:10 1.117
+++ src/sys/arch/arm/conf/files.arm 2013/06/12 07:12:10 1.118
@@ -1,202 +1,203 @@ @@ -1,202 +1,203 @@
1# $NetBSD: files.arm,v 1.117 2013/05/19 15:51:10 rkujawa Exp $ 1# $NetBSD: files.arm,v 1.118 2013/06/12 07:12:10 matt Exp $
2 2
3# temporary define to allow easy moving to ../arch/arm/arm32 3# temporary define to allow easy moving to ../arch/arm/arm32
4defflag ARM32 4defflag ARM32
5 5
6# CPU types. Make sure to update <arm/cpuconf.h> if you change this list. 6# CPU types. Make sure to update <arm/cpuconf.h> if you change this list.
7defflag opt_cputypes.h CPU_ARM2 CPU_ARM250 CPU_ARM3 7defflag opt_cputypes.h CPU_ARM2 CPU_ARM250 CPU_ARM3
8defflag opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8 8defflag opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
9 CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 9 CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 CPU_ARMV7
10 CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0 10 CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0
11 CPU_FA526 CPU_CORTEX CPU_PJ4B 11 CPU_FA526 CPU_XSCALE_80200 CPU_XSCALE_80321
12 CPU_XSCALE_80200 CPU_XSCALE_80321 
13 CPU_XSCALE_PXA250 CPU_XSCALE_PXA270 12 CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
14 CPU_XSCALE_IXP425  13 CPU_XSCALE_IXP425
15 CPU_SHEEVA 14 CPU_SHEEVA
16defflag opt_cputypes.h CPU_ARM1136: CPU_ARM11 15defflag opt_cputypes.h CPU_ARM1136: CPU_ARM11
17defflag opt_cputypes.h CPU_ARM1176: CPU_ARM11 16defflag opt_cputypes.h CPU_ARM1176: CPU_ARM11
18defflag opt_cputypes.h CPU_ARM11MPCORE: CPU_ARM11 17defflag opt_cputypes.h CPU_ARM11MPCORE: CPU_ARM11
 18defflag opt_cputypes.h CPU_PJ4B: CPU_ARMV7
 19defflag opt_cputypes.h CPU_CORTEX: CPU_ARMV7
19defflag opt_cputypes.h CPU_CORTEXA5: CPU_CORTEX 20defflag opt_cputypes.h CPU_CORTEXA5: CPU_CORTEX
20defflag opt_cputypes.h CPU_CORTEXA7: CPU_CORTEX 21defflag opt_cputypes.h CPU_CORTEXA7: CPU_CORTEX
21defflag opt_cputypes.h CPU_CORTEXA8: CPU_CORTEX 22defflag opt_cputypes.h CPU_CORTEXA8: CPU_CORTEX
22defflag opt_cputypes.h CPU_CORTEXA9: CPU_CORTEX 23defflag opt_cputypes.h CPU_CORTEXA9: CPU_CORTEX
23defflag opt_cputypes.h CPU_CORTEXA15: CPU_CORTEX 24defflag opt_cputypes.h CPU_CORTEXA15: CPU_CORTEX
24defflag opt_cputypes.h FPU_VFP 25defflag opt_cputypes.h FPU_VFP
25 26
26defparam opt_cpuoptions.h XSCALE_CCLKCFG 27defparam opt_cpuoptions.h XSCALE_CCLKCFG
27defflag opt_cpuoptions.h XSCALE_CACHE_WRITE_THROUGH 28defflag opt_cpuoptions.h XSCALE_CACHE_WRITE_THROUGH
28defflag opt_cpuoptions.h XSCALE_CACHE_WRITE_BACK 29defflag opt_cpuoptions.h XSCALE_CACHE_WRITE_BACK
29defflag opt_cpuoptions.h XSCALE_NO_COALESCE_WRITES 30defflag opt_cpuoptions.h XSCALE_NO_COALESCE_WRITES
30defflag opt_cpuoptions.h XSCALE_CACHE_READ_WRITE_ALLOCATE 31defflag opt_cpuoptions.h XSCALE_CACHE_READ_WRITE_ALLOCATE
31defflag opt_cpuoptions.h ARM32_DISABLE_ALIGNMENT_FAULTS 32defflag opt_cpuoptions.h ARM32_DISABLE_ALIGNMENT_FAULTS
32defflag opt_cpuoptions.h ARM9_CACHE_WRITE_THROUGH 33defflag opt_cpuoptions.h ARM9_CACHE_WRITE_THROUGH
33defflag opt_cpuoptions.h TPIDRPRW_IS_CURLWP 34defflag opt_cpuoptions.h TPIDRPRW_IS_CURLWP
34defflag opt_cpuoptions.h TPIDRPRW_IS_CURCPU 35defflag opt_cpuoptions.h TPIDRPRW_IS_CURCPU
35defflag opt_cpuoptions.h ARM11_PMC CORTEX_PMC 36defflag opt_cpuoptions.h ARM11_PMC CORTEX_PMC
36defflag opt_cpuoptions.h ARM11_CACHE_WRITE_THROUGH 37defflag opt_cpuoptions.h ARM11_CACHE_WRITE_THROUGH
37defflag opt_cpuoptions.h ARM11MPCORE_COMPAT_MMU 38defflag opt_cpuoptions.h ARM11MPCORE_COMPAT_MMU
38# use extended small page in compatible MMU mode for ARMv6 39# use extended small page in compatible MMU mode for ARMv6
39defflag opt_cpuoptions.h ARMV6_EXTENDED_SMALL_PAGE 40defflag opt_cpuoptions.h ARMV6_EXTENDED_SMALL_PAGE
40 41
41# Interrupt implementation header definition. 42# Interrupt implementation header definition.
42defparam opt_arm_intr_impl.h ARM_INTR_IMPL 43defparam opt_arm_intr_impl.h ARM_INTR_IMPL
43 44
44# ARM-specific debug options 45# ARM-specific debug options
45defflag opt_arm_debug.h ARM_LOCK_CAS_DEBUG 46defflag opt_arm_debug.h ARM_LOCK_CAS_DEBUG
46 47
47# Board-specific bus_space(9)/bus_dma(9) definitions 48# Board-specific bus_space(9)/bus_dma(9) definitions
48defflag opt_arm_bus_space.h __BUS_SPACE_HAS_STREAM_METHODS 49defflag opt_arm_bus_space.h __BUS_SPACE_HAS_STREAM_METHODS
49 _ARM32_NEED_BUS_DMA_BOUNCE 50 _ARM32_NEED_BUS_DMA_BOUNCE
50 BUSDMA_COUNTERS 51 BUSDMA_COUNTERS
51 52
52# Floating point emulator 53# Floating point emulator
53obsolete defflag ARMFPE 54obsolete defflag ARMFPE
54 55
55# VFP support 56# VFP support
56file arch/arm/vfp/vfp_init.c arm32 57file arch/arm/vfp/vfp_init.c arm32
57#file arch/arm/vfp/pmap_vfp.S arm32 & fpu_vfp 58#file arch/arm/vfp/pmap_vfp.S arm32 & fpu_vfp
58 59
59# PMAP_DEBUG (heavily abused option) 60# PMAP_DEBUG (heavily abused option)
60defflag PMAP_DEBUG 61defflag PMAP_DEBUG
61 62
62# New PMAP options 63# New PMAP options
63defflag opt_arm32_pmap.h ARM32_NEW_VM_LAYOUT PMAPCOUNTERS 64defflag opt_arm32_pmap.h ARM32_NEW_VM_LAYOUT PMAPCOUNTERS
64 PMAP_STEAL_MEMORY PMAP_NEED_ALLOC_POOLPAGE 65 PMAP_STEAL_MEMORY PMAP_NEED_ALLOC_POOLPAGE
65 66
66# MI console support 67# MI console support
67file dev/cons.c 68file dev/cons.c
68 69
69# DDB 70# DDB
70file arch/arm/arm/db_disasm.c ddb 71file arch/arm/arm/db_disasm.c ddb
71file arch/arm/arm32/db_interface.c (ddb|kgdb) & arm32 72file arch/arm/arm32/db_interface.c (ddb|kgdb) & arm32
72file arch/arm/arm/db_trace.c ddb 73file arch/arm/arm/db_trace.c ddb
73file arch/arm/arm32/db_machdep.c ddb & arm32 74file arch/arm/arm32/db_machdep.c ddb & arm32
74file arch/arm/arm32/kgdb_machdep.c kgdb & arm32 75file arch/arm/arm32/kgdb_machdep.c kgdb & arm32
75 76
76# FIQ support 77# FIQ support
77file arch/arm/arm/fiq.c 78file arch/arm/arm/fiq.c
78file arch/arm/arm/fiq_subr.S 79file arch/arm/arm/fiq_subr.S
79 80
80# mainbus files 81# mainbus files
81device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1], [intrbase = -1], [core = -1] } 82device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1], [intrbase = -1], [core = -1] }
82attach mainbus at root 83attach mainbus at root
83file arch/arm/mainbus/mainbus.c mainbus & arm32 84file arch/arm/mainbus/mainbus.c mainbus & arm32
84file arch/arm/mainbus/mainbus_io.c mainbus & arm32 85file arch/arm/mainbus/mainbus_io.c mainbus & arm32
85file arch/arm/mainbus/mainbus_io_asm.S mainbus & arm32 86file arch/arm/mainbus/mainbus_io_asm.S mainbus & arm32
86 87
87device cpu { } 88device cpu { }
88attach cpu at mainbus with cpu_mainbus 89attach cpu at mainbus with cpu_mainbus
89file arch/arm/mainbus/cpu_mainbus.c cpu_mainbus & arm32 90file arch/arm/mainbus/cpu_mainbus.c cpu_mainbus & arm32
90 91
91# files related to debugging 92# files related to debugging
92file arch/arm/arm/disassem.c 93file arch/arm/arm/disassem.c
93 94
94# bus_space(9) 95# bus_space(9)
95define bus_space_generic 96define bus_space_generic
96file arch/arm/arm/bus_space_asm_generic.S bus_space_generic 97file arch/arm/arm/bus_space_asm_generic.S bus_space_generic
97file arch/arm/arm/bus_space_notimpl.S arm32 98file arch/arm/arm/bus_space_notimpl.S arm32
98 99
99file arch/arm/arm/arm_machdep.c 100file arch/arm/arm/arm_machdep.c
100file arch/arm/arm/ast.c 101file arch/arm/arm/ast.c
101file arch/arm/arm/bcopyinout.S 102file arch/arm/arm/bcopyinout.S
102file arch/arm/arm/blockio.S 103file arch/arm/arm/blockio.S
103file arch/arm/arm/bootconfig.c 104file arch/arm/arm/bootconfig.c
104file arch/arm/arm/compat_13_machdep.c compat_13 105file arch/arm/arm/compat_13_machdep.c compat_13
105file arch/arm/arm/compat_16_machdep.c compat_16 106file arch/arm/arm/compat_16_machdep.c compat_16
106file arch/arm/arm/copystr.S 107file arch/arm/arm/copystr.S
107file arch/arm/arm/core_machdep.c 108file arch/arm/arm/core_machdep.c
108file arch/arm/arm/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum 109file arch/arm/arm/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum
109file arch/arm/arm/cpufunc.c 110file arch/arm/arm/cpufunc.c
110file arch/arm/arm/cpufunc_asm.S 111file arch/arm/arm/cpufunc_asm.S
111file arch/arm/arm/cpufunc_asm_arm3.S cpu_arm2 | cpu_arm250 | cpu_arm3 112file arch/arm/arm/cpufunc_asm_arm3.S cpu_arm2 | cpu_arm250 | cpu_arm3
112file arch/arm/arm/cpufunc_asm_arm67.S cpu_arm6 | cpu_arm7 113file arch/arm/arm/cpufunc_asm_arm67.S cpu_arm6 | cpu_arm7
113file arch/arm/arm/cpufunc_asm_arm7tdmi.S cpu_arm7tdmi 114file arch/arm/arm/cpufunc_asm_arm7tdmi.S cpu_arm7tdmi
114file arch/arm/arm/cpufunc_asm_arm8.S cpu_arm8 115file arch/arm/arm/cpufunc_asm_arm8.S cpu_arm8
115file arch/arm/arm/cpufunc_asm_arm9.S cpu_arm9 116file arch/arm/arm/cpufunc_asm_arm9.S cpu_arm9
116file arch/arm/arm/cpufunc_asm_arm10.S cpu_arm9e | cpu_arm10 | 117file arch/arm/arm/cpufunc_asm_arm10.S cpu_arm9e | cpu_arm10 |
117 cpu_sheeva 118 cpu_sheeva
118file arch/arm/arm/cpufunc_asm_arm11.S cpu_arm11 | cpu_cortex 119file arch/arm/arm/cpufunc_asm_arm11.S cpu_arm11 | cpu_cortex
119file arch/arm/arm/cpufunc_asm_arm1136.S cpu_arm1136 120file arch/arm/arm/cpufunc_asm_arm1136.S cpu_arm1136
120file arch/arm/arm/cpufunc_asm_arm11x6.S cpu_arm1136 | cpu_arm1176 121file arch/arm/arm/cpufunc_asm_arm11x6.S cpu_arm1136 | cpu_arm1176
121file arch/arm/arm/cpufunc_asm_armv4.S cpu_arm9 | cpu_arm9e | 122file arch/arm/arm/cpufunc_asm_armv4.S cpu_arm9 | cpu_arm9e |
122 cpu_arm10 | 123 cpu_arm10 |
123 cpu_fa526 | 124 cpu_fa526 |
124 cpu_sa110 | 125 cpu_sa110 |
125 cpu_sa1100 | 126 cpu_sa1100 |
126 cpu_sa1110 | 127 cpu_sa1110 |
127 cpu_ixp12x0 | 128 cpu_ixp12x0 |
128 cpu_xscale_80200 | 129 cpu_xscale_80200 |
129 cpu_xscale_80321 | 130 cpu_xscale_80321 |
130 cpu_xscale_ixp425 | 131 cpu_xscale_ixp425 |
131 cpu_xscale_pxa250 | 132 cpu_xscale_pxa250 |
132 cpu_xscale_pxa270 | 133 cpu_xscale_pxa270 |
133 cpu_cortex | 134 cpu_cortex |
134 cpu_sheeva 135 cpu_sheeva
135file arch/arm/arm/cpufunc_asm_armv5.S cpu_arm10 | cpu_arm11mpcore 136file arch/arm/arm/cpufunc_asm_armv5.S cpu_arm10 | cpu_arm11mpcore
136file arch/arm/arm/cpufunc_asm_armv5_ec.S cpu_arm9e | cpu_arm10 | 137file arch/arm/arm/cpufunc_asm_armv5_ec.S cpu_arm9e | cpu_arm10 |
137 cpu_sheeva 138 cpu_sheeva
138file arch/arm/arm/cpufunc_asm_armv6.S cpu_arm11 | cpu_cortex 139file arch/arm/arm/cpufunc_asm_armv6.S cpu_arm11 | cpu_cortex
139file arch/arm/arm/cpufunc_asm_armv7.S cpu_cortex | cpu_pj4b 140file arch/arm/arm/cpufunc_asm_armv7.S cpu_cortex | cpu_pj4b
140file arch/arm/arm/cpufunc_asm_pj4b.S cpu_pj4b 141file arch/arm/arm/cpufunc_asm_pj4b.S cpu_pj4b
141file arch/arm/arm/cpufunc_asm_sa1.S cpu_sa110 | cpu_sa1100 | 142file arch/arm/arm/cpufunc_asm_sa1.S cpu_sa110 | cpu_sa1100 |
142 cpu_sa1110 | 143 cpu_sa1110 |
143 cpu_ixp12x0 144 cpu_ixp12x0
144file arch/arm/arm/cpufunc_asm_sa11x0.S cpu_sa1100 | cpu_sa1110 145file arch/arm/arm/cpufunc_asm_sa11x0.S cpu_sa1100 | cpu_sa1110
145file arch/arm/arm/cpufunc_asm_fa526.S cpu_fa526 146file arch/arm/arm/cpufunc_asm_fa526.S cpu_fa526
146file arch/arm/arm/cpufunc_asm_xscale.S cpu_xscale_80200 | 147file arch/arm/arm/cpufunc_asm_xscale.S cpu_xscale_80200 |
147 cpu_xscale_80321 | 148 cpu_xscale_80321 |
148 cpu_xscale_ixp425 | 149 cpu_xscale_ixp425 |
149 cpu_xscale_pxa250 | 150 cpu_xscale_pxa250 |
150 cpu_xscale_pxa270 | 151 cpu_xscale_pxa270 |
151 cpu_cortex 152 cpu_cortex
152file arch/arm/arm/cpufunc_asm_ixp12x0.S cpu_ixp12x0 153file arch/arm/arm/cpufunc_asm_ixp12x0.S cpu_ixp12x0
153file arch/arm/arm/cpufunc_asm_sheeva.S cpu_sheeva 154file arch/arm/arm/cpufunc_asm_sheeva.S cpu_sheeva
154file arch/arm/arm/cpu_exec.c 155file arch/arm/arm/cpu_exec.c
155file arch/arm/arm/fusu.S 156file arch/arm/arm/fusu.S
156file arch/arm/arm/idle_machdep.c 157file arch/arm/arm/idle_machdep.c
157file arch/arm/arm/lock_cas.S 158file arch/arm/arm/lock_cas.S
158file arch/arm/arm/process_machdep.c 159file arch/arm/arm/process_machdep.c
159file arch/arm/arm/procfs_machdep.c procfs 160file arch/arm/arm/procfs_machdep.c procfs
160file arch/arm/arm/sig_machdep.c 161file arch/arm/arm/sig_machdep.c
161file arch/arm/arm/sigcode.S 162file arch/arm/arm/sigcode.S
162file arch/arm/arm/syscall.c 163file arch/arm/arm/syscall.c
163file arch/arm/arm/undefined.c 164file arch/arm/arm/undefined.c
164# vectors.S gets included manually by Makefile.acorn26, since it needs 165# vectors.S gets included manually by Makefile.acorn26, since it needs
165# to be at the start of the text segment on those machines. 166# to be at the start of the text segment on those machines.
166file arch/arm/arm/vectors.S arm32 167file arch/arm/arm/vectors.S arm32
167 168
168# files common to arm32 implementations 169# files common to arm32 implementations
169file arch/arm/arm32/arm32_machdep.c arm32 170file arch/arm/arm32/arm32_machdep.c arm32
170file arch/arm/arm32/bus_dma.c arm32 171file arch/arm/arm32/bus_dma.c arm32
171file arch/arm/arm32/cpu.c arm32 & cpu 172file arch/arm/arm32/cpu.c arm32 & cpu
172file arch/arm/arm32/cpuswitch.S arm32 173file arch/arm/arm32/cpuswitch.S arm32
173file arch/arm/arm32/exception.S arm32 174file arch/arm/arm32/exception.S arm32
174file arch/arm/arm32/fault.c arm32 175file arch/arm/arm32/fault.c arm32
175file arch/arm/arm32/kobj_machdep.c arm32 & modular 176file arch/arm/arm32/kobj_machdep.c arm32 & modular
176file arch/arm/arm32/pmap.c arm32 177file arch/arm/arm32/pmap.c arm32
177file arch/arm/arm32/setcpsr.S arm32 178file arch/arm/arm32/setcpsr.S arm32
178file arch/arm/arm32/setstack.S arm32 179file arch/arm/arm32/setstack.S arm32
179file arch/arm/arm32/stubs.c arm32 180file arch/arm/arm32/stubs.c arm32
180file arch/arm/arm32/sys_machdep.c arm32 181file arch/arm/arm32/sys_machdep.c arm32
181file arch/arm/arm32/vm_machdep.c arm32 182file arch/arm/arm32/vm_machdep.c arm32
182file arch/arm/arm32/atomic.S arm32 183file arch/arm/arm32/atomic.S arm32
183 184
184# files less common to arm32 implementations... 185# files less common to arm32 implementations...
185file kern/kern_cctr.c arm11 186file kern/kern_cctr.c arm11
186file arch/arm/arm32/arm11_pmc.c arm11_pmc 187file arch/arm/arm32/arm11_pmc.c arm11_pmc
187file arch/arm/arm32/cortex_pmc.c cortex_pmc 188file arch/arm/arm32/cortex_pmc.c cortex_pmc
188 189
189# arm32 library functions 190# arm32 library functions
190file arch/arm/arm32/bcopy_page.S arm32 191file arch/arm/arm32/bcopy_page.S arm32
191 192
192# 193#
193include "compat/netbsd32/files.netbsd32" 194include "compat/netbsd32/files.netbsd32"
194file arch/arm/arm32/netbsd32_machdep.c arm32 & compat_netbsd32 195file arch/arm/arm32/netbsd32_machdep.c arm32 & compat_netbsd32
195 196
196# Linux binary compatibility (COMPAT_LINUX) 197# Linux binary compatibility (COMPAT_LINUX)
197include "compat/ossaudio/files.ossaudio" 198include "compat/ossaudio/files.ossaudio"
198include "compat/linux/files.linux" 199include "compat/linux/files.linux"
199include "compat/linux/arch/arm/files.linux_arm" 200include "compat/linux/arch/arm/files.linux_arm"
200file arch/arm/arm/linux_sigcode.S compat_linux 201file arch/arm/arm/linux_sigcode.S compat_linux
201file arch/arm/arm/linux_syscall.c compat_linux 202file arch/arm/arm/linux_syscall.c compat_linux
202file arch/arm/arm/linux_trap.c compat_linux 203file arch/arm/arm/linux_trap.c compat_linux