Author: imp
Date: Sun Feb 2 08:27:14 2020
New Revision: 357399
URL: https://svnweb.freebsd.org/changeset/base/357399
Log:
Kill old armv4 busdma
Move to having one busdma option for arm: the armv6/v7 one.
Kill now-unused option ARM_USE_V6_BUSDMA too.
Fixup files.arm to match rename.
Added:
head/sys/arm/arm/busdma_machdep.c (contents, props changed)
- copied, changed from r357398, head/sys/arm/arm/busdma_machdep-v6.c
Deleted:
head/sys/arm/arm/busdma_machdep-v4.c
head/sys/arm/arm/busdma_machdep-v6.c
Modified:
head/sys/conf/files.arm
head/sys/conf/options.arm
Copied and modified: head/sys/arm/arm/busdma_machdep.c (from r357398,
head/sys/arm/arm/busdma_machdep-v6.c)
==============================================================================
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Sun Feb 2 08:27:08 2020 (r357398)
+++ head/sys/conf/files.arm Sun Feb 2 08:27:14 2020 (r357399)
@@ -9,8 +9,7 @@ arm/arm/blockio.S standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_base.c optional fdt
arm/arm/bus_space_generic.c standard
-arm/arm/busdma_machdep-v4.c optional !armv7 !armv6 !ARM_USE_V6_BUSDMA
-arm/arm/busdma_machdep-v6.c optional armv7 | armv6 |
ARM_USE_V6_BUSDMA
+arm/arm/busdma_machdep.c standard
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
arm/arm/cpufunc_asm.S standard
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Sun Feb 2 08:27:08 2020 (r357398)
+++ head/sys/conf/options.arm Sun Feb 2 08:27:14 2020 (r357399)
@@ -5,7 +5,6 @@ ARM_CACHE_LOCK_ENABLE opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
ARM_L2_PIPT opt_global.h
ARM_MANY_BOARD opt_global.h
-ARM_USE_V6_BUSDMA opt_global.h
ARM_WANT_TP_ADDRESS opt_global.h
COUNTS_PER_SEC opt_timer.h
CPSW_ETHERSWITCH opt_cpsw.h
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
