summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/files.arm8
-rw-r--r--sys/conf/options.arm1
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index d5a5b66..0e1439f 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -5,8 +5,8 @@ arm/arm/bcopyinout.S standard
arm/arm/blockio.S standard
arm/arm/bootconfig.c standard
arm/arm/bus_space_asm_generic.S standard
-arm/arm/busdma_machdep.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
-arm/arm/busdma_machdep-v6.c optional cpu_arm1136 | cpu_arm1176 | cpu_cortexa | cpu_mv_pj4b | cpu_krait
+arm/arm/busdma_machdep.c optional !armv6
+arm/arm/busdma_machdep-v6.c optional armv6
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
arm/arm/cpufunc_asm.S standard
@@ -39,8 +39,8 @@ arm/arm/pl190.c optional pl190
arm/arm/pl310.c optional pl310
arm/arm/platform.c optional platform
arm/arm/platform_if.m optional platform
-arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
-arm/arm/pmap-v6.c optional cpu_arm1136 | cpu_arm1176 | cpu_cortexa | cpu_mv_pj4b | cpu_krait
+arm/arm/pmap.c optional !armv6
+arm/arm/pmap-v6.c optional armv6
arm/arm/sc_machdep.c optional sc
arm/arm/setcpsr.S standard
arm/arm/setstack.s standard
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index fd32e52..433445f 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,5 +1,6 @@
#$FreeBSD$
ARM9_CACHE_WRITE_THROUGH opt_global.h
+ARMV6 opt_global.h
ARM_CACHE_LOCK_ENABLE opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
ARM_L2_PIPT opt_global.h
OpenPOWER on IntegriCloud