svn commit: r320082 - head/sys/conf

[Warner Losh]

Author: imp
Date: Sun Jun 18 21:03:48 2017
New Revision: 320082
URL: https://svnweb.freebsd.org/changeset/base/320082

Log:
  Create a new option ARM_USE_V6_BUSDMA to force an armv4/5 kernel to
  use the armv6 busdma interface. This interface uses more memory than
  the armv4 one, but bounces more data more often so may be more correct
  than the armv4 one. It is intended for debugging purposes only at the
  moment.

Modified:
  head/sys/conf/files.arm
  head/sys/conf/options.arm

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Sun Jun 18 21:03:43 2017	(r320081)
+++ head/sys/conf/files.arm	Sun Jun 18 21:03:48 2017	(r320082)
@@ -25,8 +25,8 @@ 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	!armv6
-arm/arm/busdma_machdep-v6.c 	optional	armv6
+arm/arm/busdma_machdep-v4.c 	optional	!armv6 !ARM_USE_V6_BUSDMA
+arm/arm/busdma_machdep-v6.c 	optional	armv6 | ARM_USE_V6_BUSDMA
 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 Jun 18 21:03:43 2017	(r320081)
+++ head/sys/conf/options.arm	Sun Jun 18 21:03:48 2017	(r320082)
@@ -4,7 +4,7 @@ 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
-NKPT2PG			opt_pmap.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
@@ -35,6 +35,7 @@ KERNVIRTADDR		opt_global.h
 LINUX_BOOT_ABI		opt_global.h
 LOADERRAMADDR		opt_global.h
 MULTIDELAY		opt_global.h
+NKPT2PG			opt_pmap.h
 PHYSADDR		opt_global.h
 PLATFORM		opt_global.h
 PLATFORM_SMP		opt_global.h