[src/trunk]: src/sys/arch/arm/conf Rework to have CPU_PREARMV6, CPU_ARMV6, as...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce263ceead77
branches:  trunk
changeset: 787766:ce263ceead77
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jul 02 06:07:11 2013 +0000

description:
Rework to have CPU_PREARMV6, CPU_ARMV6, as well as CPU_ARMV7

diffstat:

 sys/arch/arm/conf/files.arm |  37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r e954da16037b -r ce263ceead77 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Tue Jul 02 05:57:00 2013 +0000
+++ b/sys/arch/arm/conf/files.arm       Tue Jul 02 06:07:11 2013 +0000
@@ -1,17 +1,32 @@
-#      $NetBSD: files.arm,v 1.120 2013/06/22 00:35:31 matt Exp $
+#      $NetBSD: files.arm,v 1.121 2013/07/02 06:07:11 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag                                ARM32
 
 # CPU types.  Make sure to update <arm/cpuconf.h> if you change this list.
-defflag        opt_cputypes.h          CPU_ARM2 CPU_ARM250 CPU_ARM3
-defflag        opt_cputypes.h          CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
-                               CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 CPU_ARMV7
-                               CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0
-                               CPU_FA526 CPU_XSCALE_80200 CPU_XSCALE_80321
-                               CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
-                               CPU_XSCALE_IXP425 
-                               CPU_SHEEVA
+defflag        opt_cputypes.h          CPU_PRE_ARMV6 CPU_ARMV6 CPU_ARMV7
+defflag        opt_cputypes.h          CPU_ARM2: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM250: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM3: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM6: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM7: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM7TDMI: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM8: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM9: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM9E: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM10: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_SA110: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_SA1100: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_SA1110: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_IXP12X0: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_FA526: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_XSCALE_80200: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_XSCALE_80321: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_XSCALE_PXA250: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_XSCALE_PXA270: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_XSCALE_IXP425: CPU_PRE_ARMV6 
+defflag        opt_cputypes.h          CPU_SHEEVA: CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARM11: CPU_ARMV6
 defflag        opt_cputypes.h          CPU_ARM1136: CPU_ARM11
 defflag        opt_cputypes.h          CPU_ARM1176: CPU_ARM11
 defflag        opt_cputypes.h          CPU_ARM11MPCORE: CPU_ARM11
@@ -22,7 +37,7 @@
 defflag        opt_cputypes.h          CPU_CORTEXA8: CPU_CORTEX
 defflag        opt_cputypes.h          CPU_CORTEXA9: CPU_CORTEX
 defflag        opt_cputypes.h          CPU_CORTEXA15: CPU_CORTEX
-defflag opt_cputypes.h         FPU_VFP
+defflag        opt_cputypes.h          FPU_VFP
 
 defparam opt_cpuoptions.h      XSCALE_CCLKCFG
 defflag  opt_cpuoptions.h      XSCALE_CACHE_WRITE_THROUGH
@@ -35,7 +50,7 @@
 defflag  opt_cpuoptions.h      TPIDRPRW_IS_CURCPU
 defflag  opt_cpuoptions.h      ARM11_PMC CORTEX_PMC
 defflag  opt_cpuoptions.h      ARM11_CACHE_WRITE_THROUGH
-defflag         opt_cpuoptions.h       ARM11MPCORE_COMPAT_MMU
+defflag         opt_cpuoptions.h       ARM11_COMPAT_MMU
 defflag         opt_cpuoptions.h       ARM_HAS_VBAR
 # use extended small page in compatible MMU mode for ARMv6
 defflag  opt_cpuoptions.h      ARMV6_EXTENDED_SMALL_PAGE