diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index f03d2a17471..0b0808d07c2 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -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
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 8d19d097872..99c107afc9b 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -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