Index: sys/arm/allwinner/std.allwinner
===================================================================
--- sys/arm/allwinner/std.allwinner
+++ sys/arm/allwinner/std.allwinner
@@ -2,7 +2,7 @@
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000
Index: sys/arm/allwinner/std.allwinner_up
===================================================================
--- sys/arm/allwinner/std.allwinner_up
+++ sys/arm/allwinner/std.allwinner_up
@@ -2,7 +2,7 @@
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000
Index: sys/arm/altera/socfpga/std.socfpga
===================================================================
--- sys/arm/altera/socfpga/std.socfpga
+++ sys/arm/altera/socfpga/std.socfpga
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
Index: sys/arm/amlogic/aml8726/std.aml8726
===================================================================
--- sys/arm/amlogic/aml8726/std.aml8726
+++ sys/arm/amlogic/aml8726/std.aml8726
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 # Physical memory starts at 0x80000000.  We assume the kernel is loaded
Index: sys/arm/annapurna/alpine/std.alpine
===================================================================
--- sys/arm/annapurna/alpine/std.alpine
+++ sys/arm/annapurna/alpine/std.alpine
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
 makeoptions	KERNVIRTADDR=0xa0200000
Index: sys/arm/broadcom/bcm2835/std.bcm2836
===================================================================
--- sys/arm/broadcom/bcm2835/std.bcm2836
+++ sys/arm/broadcom/bcm2835/std.bcm2836
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-machine 	arm armv6
+machine 	arm armv7
 cpu		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836
Index: sys/arm/conf/ALLWINNER_UP
===================================================================
--- sys/arm/conf/ALLWINNER_UP
+++ sys/arm/conf/ALLWINNER_UP
@@ -20,7 +20,7 @@
 
 ident		ALLWINNER_UP
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../allwinner/std.allwinner_up"
 
 options 	INTRNG
Index: sys/arm/conf/ALPINE
===================================================================
--- sys/arm/conf/ALPINE
+++ sys/arm/conf/ALPINE
@@ -19,7 +19,7 @@
 
 ident		ALPINE
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../annapurna/alpine/std.alpine"
 
 makeoptions	MODULES_OVERRIDE=""
Index: sys/arm/conf/AML8726
===================================================================
--- sys/arm/conf/AML8726
+++ sys/arm/conf/AML8726
@@ -23,7 +23,7 @@
 
 ident		AML8726
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../amlogic/aml8726/std.aml8726"
 
 options 	SCHED_ULE		# ULE scheduler
Index: sys/arm/conf/ARMADA38X
===================================================================
--- sys/arm/conf/ARMADA38X
+++ sys/arm/conf/ARMADA38X
@@ -5,7 +5,7 @@
 #
 
 include 	"../mv/armada38x/std.armada38x"
-include 	"std.armv6"
+include 	"std.armv7"
 
 ident 	ARMADA38X
 
Index: sys/arm/conf/ARMADAXP
===================================================================
--- sys/arm/conf/ARMADAXP
+++ sys/arm/conf/ARMADAXP
@@ -23,7 +23,7 @@
 
 ident		MV-88F78XX0
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../mv/armadaxp/std.mv78x60"
 
 options 	SOC_MV_ARMADAXP
Index: sys/arm/conf/BEAGLEBONE
===================================================================
--- sys/arm/conf/BEAGLEBONE
+++ sys/arm/conf/BEAGLEBONE
@@ -23,7 +23,7 @@
 
 ident		BEAGLEBONE
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"
Index: sys/arm/conf/EFIKA_MX
===================================================================
--- sys/arm/conf/EFIKA_MX
+++ sys/arm/conf/EFIKA_MX
@@ -20,7 +20,7 @@
 
 ident		EFIKA_MX
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx51"
 
 makeoptions	WITHOUT_MODULES="ahc"
Index: sys/arm/conf/EXYNOS5.common
===================================================================
--- sys/arm/conf/EXYNOS5.common
+++ sys/arm/conf/EXYNOS5.common
@@ -20,7 +20,7 @@
 
 makeoptions	WERROR="-Werror"
 
-include 	"std.armv6"
+include 	"std.armv7"
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
 options 	PREEMPTION		# Enable kernel thread preemption
Index: sys/arm/conf/GENERIC
===================================================================
--- sys/arm/conf/GENERIC
+++ sys/arm/conf/GENERIC
@@ -22,13 +22,13 @@
 
 cpu		CPU_CORTEXA
 options 	SMP_ON_UP
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0000000
 options 	KERNVIRTADDR=0xc0000000
 
-include 	"std.armv6"
+include 	"std.armv7"
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.allwinner_up"
 files		"../allwinner/a10/files.a10"
Index: sys/arm/conf/IMX53
===================================================================
--- sys/arm/conf/IMX53
+++ sys/arm/conf/IMX53
@@ -20,7 +20,7 @@
 
 ident		IMX53
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx53"
 
 options 	SOC_IMX53
Index: sys/arm/conf/IMX6
===================================================================
--- sys/arm/conf/IMX6
+++ sys/arm/conf/IMX6
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		IMX6
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx6"
 
 options 	INTRNG
Index: sys/arm/conf/PANDABOARD
===================================================================
--- sys/arm/conf/PANDABOARD
+++ sys/arm/conf/PANDABOARD
@@ -27,7 +27,7 @@
 
 hints		"PANDABOARD.hints"
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../ti/omap4/std.omap4"
 
 makeoptions	MODULES_EXTRA=dtb/omap4
Index: sys/arm/conf/RK3188
===================================================================
--- sys/arm/conf/RK3188
+++ sys/arm/conf/RK3188
@@ -20,7 +20,7 @@
 
 ident		RK3188
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../rockchip/std.rk30xx"
 
 options 	SOC_ROCKCHIP_RK3188
Index: sys/arm/conf/RPI2
===================================================================
--- sys/arm/conf/RPI2
+++ sys/arm/conf/RPI2
@@ -22,7 +22,7 @@
 
 ident		RPI2
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"
 
Index: sys/arm/conf/SOCFPGA
===================================================================
--- sys/arm/conf/SOCFPGA
+++ sys/arm/conf/SOCFPGA
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		SOCFPGA
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""
Index: sys/arm/conf/TEGRA124
===================================================================
--- sys/arm/conf/TEGRA124
+++ sys/arm/conf/TEGRA124
@@ -18,7 +18,7 @@
 #
 # $FreeBSD$
 
-include  	"std.armv6"
+include  	"std.armv7"
 include 	"../nvidia/tegra124/std.tegra124"
 
 ident		TEGRA124
Index: sys/arm/conf/VIRT
===================================================================
--- sys/arm/conf/VIRT
+++ sys/arm/conf/VIRT
@@ -20,7 +20,7 @@
 
 ident		VIRT
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../qemu/std.virt"
 
 options 	SCHED_ULE		# ULE scheduler
Index: sys/arm/conf/VYBRID
===================================================================
--- sys/arm/conf/VYBRID
+++ sys/arm/conf/VYBRID
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		VYBRID
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/vybrid/std.vybrid"
 
 makeoptions	WERROR="-Werror"
Index: sys/arm/conf/ZEDBOARD
===================================================================
--- sys/arm/conf/ZEDBOARD
+++ sys/arm/conf/ZEDBOARD
@@ -21,7 +21,7 @@
 
 ident		ZEDBOARD
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../xilinx/std.zynq7"
 
 makeoptions	MODULES_EXTRA="dtb/zynq"
Index: sys/arm/conf/std.armv6
===================================================================
--- sys/arm/conf/std.armv6
+++ sys/arm/conf/std.armv6
@@ -1,4 +1,4 @@
-# Standard kernel config items for all ARMv6/v7 systems.
+# Standard kernel config items for all ARMv6 systems.
 #
 # $FreeBSD$
 
Index: sys/arm/conf/std.armv7
===================================================================
--- sys/arm/conf/std.armv7
+++ sys/arm/conf/std.armv7
@@ -1,4 +1,4 @@
-# Standard kernel config items for all ARMv6/v7 systems.
+# Standard kernel config items for all ARMv7 systems.
 #
 # $FreeBSD$
 
Index: sys/arm/freescale/imx/std.imx51
===================================================================
--- sys/arm/freescale/imx/std.imx51
+++ sys/arm/freescale/imx/std.imx51
@@ -1,5 +1,5 @@
 # $FreeBSD$
-machine		arm	armv6
+machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: sys/arm/freescale/imx/std.imx53
===================================================================
--- sys/arm/freescale/imx/std.imx53
+++ sys/arm/freescale/imx/std.imx53
@@ -1,5 +1,5 @@
 # $FreeBSD$
-machine		arm	armv6
+machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: sys/arm/freescale/imx/std.imx6
===================================================================
--- sys/arm/freescale/imx/std.imx6
+++ sys/arm/freescale/imx/std.imx6
@@ -1,5 +1,5 @@
 # $FreeBSD$
-machine		arm	armv6
+machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: sys/arm/freescale/vybrid/std.vybrid
===================================================================
--- sys/arm/freescale/vybrid/std.vybrid
+++ sys/arm/freescale/vybrid/std.vybrid
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0100000
Index: sys/arm/mv/armada38x/std.armada38x
===================================================================
--- sys/arm/mv/armada38x/std.armada38x
+++ sys/arm/mv/armada38x/std.armada38x
@@ -2,7 +2,7 @@
 files		"../mv/armada38x/files.armada38x"
 files		"../mv/files.mv"
 cpu		CPU_CORTEXA
-machine		arm	armv6
+machine		arm	armv7
 
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0000000
Index: sys/arm/mv/std-pj4b.mv
===================================================================
--- sys/arm/mv/std-pj4b.mv
+++ sys/arm/mv/std-pj4b.mv
@@ -2,7 +2,7 @@
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
-machine 	arm	armv6
+machine 	arm	armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 # This was originally defined as "(KERNBASE-(1024*1024*1024))" but that
Index: sys/arm/nvidia/tegra124/std.tegra124
===================================================================
--- sys/arm/nvidia/tegra124/std.tegra124
+++ sys/arm/nvidia/tegra124/std.tegra124
@@ -1,6 +1,6 @@
 # $FreeBSD$
 cpu 		CPU_CORTEXA
-machine		arm	armv6
+machine		arm	armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 options		KERNVIRTADDR		= 0xc0200000
Index: sys/arm/qemu/std.virt
===================================================================
--- sys/arm/qemu/std.virt
+++ sys/arm/qemu/std.virt
@@ -1,5 +1,5 @@
 # $FreeBSD$
-machine		arm	armv6
+machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: sys/arm/rockchip/std.rk30xx
===================================================================
--- sys/arm/rockchip/std.rk30xx
+++ sys/arm/rockchip/std.rk30xx
@@ -2,7 +2,7 @@
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0400000
Index: sys/arm/samsung/exynos/std.exynos5250
===================================================================
--- sys/arm/samsung/exynos/std.exynos5250
+++ sys/arm/samsung/exynos/std.exynos5250
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
Index: sys/arm/samsung/exynos/std.exynos5420
===================================================================
--- sys/arm/samsung/exynos/std.exynos5420
+++ sys/arm/samsung/exynos/std.exynos5420
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000
Index: sys/arm/ti/std.ti
===================================================================
--- sys/arm/ti/std.ti
+++ sys/arm/ti/std.ti
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-machine 	arm	armv6
+machine 	arm	armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 files		"../ti/files.ti"
Index: sys/arm/xilinx/std.zynq7
===================================================================
--- sys/arm/xilinx/std.zynq7
+++ sys/arm/xilinx/std.zynq7
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm	armv6
+machine		arm	armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 files		"../xilinx/files.zynq7"