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 (expand / 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,31 +1,32 @@ @@ -1,31 +1,32 @@
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