svn commit: r274937 - head/sys/conf
Ian Lepore
ian at FreeBSD.org
Mon Nov 24 00:02:16 UTC 2014
Author: ian
Date: Mon Nov 24 00:02:15 2014
New Revision: 274937
URL: https://svnweb.freebsd.org/changeset/base/274937
Log:
Add ARMV6 as an arm option. This will cause obscure magic in config(8)
to automatically set the armv6 option when MACHINE_ARCH is armv6. That
allows replacing ever-growing lists of cpu names as options to compile
a given file with the using either "optional armv6" or "optional !armv6".
Modified:
head/sys/conf/files.arm
head/sys/conf/options.arm
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Sun Nov 23 23:58:47 2014 (r274936)
+++ head/sys/conf/files.arm Mon Nov 24 00:02:15 2014 (r274937)
@@ -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
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Sun Nov 23 23:58:47 2014 (r274936)
+++ head/sys/conf/options.arm Mon Nov 24 00:02:15 2014 (r274937)
@@ -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
More information about the svn-src-all
mailing list