From 65c3de4e620a465cfd7bf067bcc18ec33cc2275b Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 5 May 2015 16:09:25 +0000
Subject: [PATCH] Create std.arm and std.armv6 config files and include the
 right one from each of the existing kernel configs.  This gives a place to
 put config that applies to the entire arch.

Add the ARM_NEW_PMAP option to std.armv6.  This is working well in early
testing and it's time for wide exposure, but it's still nice to be able
to fall back to the old implementation for testing when a problem comes
along.  Eventually the option and the old implementation will go away.

The opportunity now exists to move a whole lot of boilerplate from all the
arm kernel config files into std.arm*, but that's a commit for another day.
---
 sys/arm/conf/AML8726        | 2 ++
 sys/arm/conf/ARMADAXP       | 2 ++
 sys/arm/conf/ATMEL          | 1 +
 sys/arm/conf/AVILA          | 1 +
 sys/arm/conf/BEAGLEBONE     | 2 +-
 sys/arm/conf/BWCT           | 1 +
 sys/arm/conf/CAMBRIA        | 1 +
 sys/arm/conf/CNS11XXNAS     | 1 +
 sys/arm/conf/CRB            | 1 +
 sys/arm/conf/CUBIEBOARD     | 1 +
 sys/arm/conf/CUBIEBOARD2    | 1 +
 sys/arm/conf/DB-78XXX       | 1 +
 sys/arm/conf/DB-88F5XXX     | 1 +
 sys/arm/conf/DB-88F6XXX     | 1 +
 sys/arm/conf/DOCKSTAR       | 1 +
 sys/arm/conf/DREAMPLUG-1001 | 1 +
 sys/arm/conf/EA3250         | 1 +
 sys/arm/conf/EB9200         | 1 +
 sys/arm/conf/EFIKA_MX       | 1 +
 sys/arm/conf/EP80219        | 1 +
 sys/arm/conf/ETHERNUT5      | 1 +
 sys/arm/conf/EXYNOS5.common | 1 +
 sys/arm/conf/GUMSTIX        | 1 +
 sys/arm/conf/HL200          | 1 +
 sys/arm/conf/HL201          | 1 +
 sys/arm/conf/IMX53          | 1 +
 sys/arm/conf/IMX6           | 1 +
 sys/arm/conf/IQ31244        | 1 +
 sys/arm/conf/KB920X         | 1 +
 sys/arm/conf/LN2410SBC      | 1 +
 sys/arm/conf/NSLU           | 1 +
 sys/arm/conf/PANDABOARD     | 2 +-
 sys/arm/conf/QILA9G20       | 1 +
 sys/arm/conf/RK3188         | 1 +
 sys/arm/conf/RPI-B          | 2 +-
 sys/arm/conf/RPI2           | 2 +-
 sys/arm/conf/SAM9260EK      | 1 +
 sys/arm/conf/SAM9G20EK      | 1 +
 sys/arm/conf/SAM9X25EK      | 1 +
 sys/arm/conf/SHEEVAPLUG     | 1 +
 sys/arm/conf/SN9G45         | 1 +
 sys/arm/conf/SOCKIT.common  | 1 +
 sys/arm/conf/TS7800         | 1 +
 sys/arm/conf/VERSATILEPB    | 1 +
 sys/arm/conf/VIRT           | 2 +-
 sys/arm/conf/VYBRID         | 1 +
 sys/arm/conf/ZEDBOARD       | 2 +-
 sys/arm/conf/std.arm        | 5 +++++
 sys/arm/conf/std.armv6      | 6 ++++++
 49 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 sys/arm/conf/std.arm
 create mode 100644 sys/arm/conf/std.armv6

diff --git a/sys/arm/conf/AML8726 b/sys/arm/conf/AML8726
index 7272db4b08a..e2637884f63 100644
--- a/sys/arm/conf/AML8726
+++ b/sys/arm/conf/AML8726
@@ -19,6 +19,8 @@
 # $FreeBSD$
 
 ident		AML8726
+
+include		"std.armv6"
 include 	"../amlogic/aml8726/std.aml8726"
 
 options 	HZ=100
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index f611e09da88..8d7f3585466 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -19,6 +19,8 @@
 # $FreeBSD$
 
 ident		MV-88F78XX0
+
+include		"std.armv6"
 include		"../mv/armadaxp/std.mv78x60"
 
 options 	SOC_MV_ARMADAXP
diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL
index 572cf4a1ce5..91ef8a2a71c 100644
--- a/sys/arm/conf/ATMEL
+++ b/sys/arm/conf/ATMEL
@@ -6,6 +6,7 @@
 
 ident		ATMEL
 
+include		"std.arm"
 include "../at91/std.atmel"
 
 # Typical values for most SoCs and board configurations.  Will not work for
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index cbf27a2b633..b356b353768 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -20,6 +20,7 @@
 
 ident		AVILA
 
+include		"std.arm"
 include		"../xscale/ixp425/std.ixp425"
 # NB: memory mapping is defined in std.avila
 include		"../xscale/ixp425/std.avila"
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 69c4dcfef1d..1628dd22013 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -23,6 +23,7 @@
 
 ident		BEAGLEBONE
 
+include		"std.armv6"
 include		"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x"
@@ -67,7 +68,6 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	PLATFORM
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index a9e0e784361..d483a00ea68 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -21,6 +21,7 @@
 
 ident		BWCT
 
+include		"std.arm"
 options 	VERBOSE_INIT_ARM
 
 include		"../at91/std.bwct"
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index af29b230642..1cf7fb91846 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -20,6 +20,7 @@
 
 ident		CAMBRIA
 
+include		"std.arm"
 include		"../xscale/ixp425/std.ixp435"
 # NB: memory mapping is defined in std.avila
 include		"../xscale/ixp425/std.avila"
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index 5ba221700c0..d906a2b0005 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -20,6 +20,7 @@
 
 ident		CNS11XXNAS
 
+include		"std.arm"
 #options 	PHYSADDR=0x10000000
 #options 	KERNPHYSADDR=0x10200000
 #options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 641ba9f3f0f..f5cc9322b41 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -19,6 +19,7 @@
 
 ident		CRB
 
+include		"std.arm"
 options 	PHYSADDR=0x00000000
 options 	KERNPHYSADDR=0x00200000
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm
diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD
index 945f0ae6fbc..1bb4ef21e80 100644
--- a/sys/arm/conf/CUBIEBOARD
+++ b/sys/arm/conf/CUBIEBOARD
@@ -21,6 +21,7 @@
 
 ident		CUBIEBOARD
 
+include		"std.armv6"
 include		"../allwinner/std.a10"
 
 options 	HZ=100
diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2
index d370dda954f..5bc416a4a35 100644
--- a/sys/arm/conf/CUBIEBOARD2
+++ b/sys/arm/conf/CUBIEBOARD2
@@ -21,6 +21,7 @@
 
 ident		CUBIEBOARD2
 
+include		"std.armv6"
 include		"../allwinner/a20/std.a20"
 
 options 	HZ=100
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 4fee206e8ff..2e7fa360575 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F78XX
+include		"std.arm"
 include		"../mv/discovery/std.db78xxx"
 
 options 	SOC_MV_DISCOVERY
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 6ccb360bd4d..7cc06a0407f 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F5XXX
+include		"std.arm"
 include		"../mv/orion/std.db88f5xxx"
 
 options 	SOC_MV_ORION
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index c59f1c1130d..afec0e72653 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F6XXX
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index aea158ca891..c6308cd905e 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -21,6 +21,7 @@
 
 ident		DOCKSTAR
 
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dockstar.dts
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index 0448d4f9564..f97b5642529 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -24,6 +24,7 @@
 
 ident		DREAMPLUG-1001
 
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dreamplug-1001.dts
diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250
index d2d691b3212..bcb8276a94b 100644
--- a/sys/arm/conf/EA3250
+++ b/sys/arm/conf/EA3250
@@ -5,6 +5,7 @@
 #
 
 ident		EA3250
+include		"std.arm"
 include		"../lpc/std.lpc"
 hints		"EA3250.hints"
 
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index a5ec5eb52f1..bf0c41b1fec 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -16,6 +16,7 @@
 
 ident		EB9200
 
+include		"std.arm"
 include		"../at91/std.eb9200"
 # The AT91 platform doesn't use /boot/loader, so we have to statically wire
 # hints.
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index a4690f6964f..7eb9ee91b92 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -20,6 +20,7 @@
 
 ident		EFIKA_MX
 
+include		"std.armv6"
 include 	"../freescale/imx/std.imx51"
 
 makeoptions	WITHOUT_MODULES="ahc"
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 35bcb17641f..6f2bef8b090 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -19,6 +19,7 @@
 
 ident		EP80219
 
+include		"std.arm"
 options 	PHYSADDR=0xa0000000
 options 	KERNPHYSADDR=0xa0200000	
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index 376336a2332..f01ea0d138a 100644
--- a/sys/arm/conf/ETHERNUT5
+++ b/sys/arm/conf/ETHERNUT5
@@ -21,6 +21,7 @@
 
 ident		ETHERNUT5
 
+include		"std.arm"
 include "../at91/std.ethernut5"
 
 # To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index cd6e76fb2b3..2f9693582c8 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -20,6 +20,7 @@
 
 makeoptions	WERROR="-Werror"
 
+include		"std.armv6"
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index 97d0ac7468d..9ba6155cc3d 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -19,6 +19,7 @@
 # $FreeBSD$
 
 ident		GUMSTIX
+include		"std.arm"
 cpu		CPU_XSCALE_PXA2X0
 
 # This probably wants to move somewhere else.  Maybe we can create a basic
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 3c0f4e880ce..8d22da5943a 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -21,6 +21,7 @@
 
 ident		HL200
 
+include		"std.arm"
 include "../at91/std.hl200"
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index 6a477af8098..4ec6da36fcd 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -21,6 +21,7 @@
 
 ident		HL201
 
+include		"std.arm"
 include "../at91/std.hl201"
 
 makeoptions	MODULES_OVERRIDE=""
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
index 9f78f303d76..be910a9e5f5 100644
--- a/sys/arm/conf/IMX53
+++ b/sys/arm/conf/IMX53
@@ -20,6 +20,7 @@
 
 ident		IMX53
 
+include		"std.armv6"
 include 	"../freescale/imx/std.imx53"
 
 options 	SOC_IMX53
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index f1baf296667..d452ce688ff 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -19,6 +19,7 @@
 # $FreeBSD$
 
 ident		IMX6
+include		"std.armv6"
 include 	"../freescale/imx/std.imx6"
 
 options 	SOC_IMX6
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 2066fb85c69..403a0c2e8f9 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -19,6 +19,7 @@
 
 ident		IQ31244
 
+include		"std.arm"
 options 	PHYSADDR=0xa0000000
 options 	KERNPHYSADDR=0xa0200000	
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 1fc23be2b45..6d91ad80e0c 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -22,6 +22,7 @@
 
 ident		KB920X
 
+include		"std.arm"
 include		"../at91/std.kb920x"
 # The AT91 platform doesn't use /boot/loader, so we have to statically wire
 # hints.
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index b2f64a0a771..ae3c62a94fa 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -19,6 +19,7 @@
 
 ident		LN2410SBC
 
+include		"std.arm"
 include 	"../samsung/s3c2xx0/std.ln2410sbc"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index e12c5a58384..00a29028bc3 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -21,6 +21,7 @@
 
 ident		NSLU
 
+include		"std.arm"
 # XXX What is defined in std.avila does not exactly match the following:
 #options 	PHYSADDR=0x10000000
 #options 	KERNPHYSADDR=0x10200000	
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index cf1f4553516..cc7994d020b 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -27,6 +27,7 @@ ident		PANDABOARD
 
 hints		"PANDABOARD.hints"
 
+include		"std.armv6"
 include 	"../ti/omap4/pandaboard/std.pandaboard"
 
 options 	HZ=100
@@ -64,7 +65,6 @@ options 	PLATFORM
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 options 	SMP			# Enable multiple cores
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index 7559c31079f..2f9b6093272 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -22,6 +22,7 @@
 
 ident		QILA9G20
 
+include		"std.arm"
 include "../at91/std.qila9g20"
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188
index 64065d30d70..d6e0c7fa0c1 100644
--- a/sys/arm/conf/RK3188
+++ b/sys/arm/conf/RK3188
@@ -20,6 +20,7 @@
 
 ident		RK3188
 
+include		"std.armv6"
 include		"../rockchip/std.rk30xx"
 
 options 	HZ=100
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 084d47aee36..fb3c3902346 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -20,6 +20,7 @@
 
 ident		RPI-B
 
+include		"std.armv6"
 include		"../broadcom/bcm2835/std.rpi"
 include		"../broadcom/bcm2835/std.bcm2835"
 
@@ -57,7 +58,6 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	PLATFORM
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2
index 1fefacbdc92..10c93239720 100644
--- a/sys/arm/conf/RPI2
+++ b/sys/arm/conf/RPI2
@@ -20,6 +20,7 @@
 
 ident		RPI2
 
+include		"std.armv6"
 include		"../broadcom/bcm2835/std.rpi"
 include		"../broadcom/bcm2835/std.bcm2836"
 
@@ -57,7 +58,6 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	PLATFORM
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK
index 7e88ee1fb8b..ec5d70a3836 100644
--- a/sys/arm/conf/SAM9260EK
+++ b/sys/arm/conf/SAM9260EK
@@ -21,6 +21,7 @@
 
 ident		SAM9260EK
 
+include		"std.arm"
 include "../at91/std.sam9260ek"
 
 # To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index 7f3d15c1538..f9a30525886 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -19,6 +19,7 @@
 
 ident		SAM9G20EK
 
+include		"std.arm"
 include "../at91/std.sam9g20ek"
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index 419e45631ab..49afe99fdb8 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -21,6 +21,7 @@
 
 ident		SAM9X25EK
 
+include		"std.arm"
 include "../at91/std.sam9x25ek"
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 9d8ea269892..e013e7502a3 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -6,6 +6,7 @@
 #NO_UNIVERSE
 
 ident		SHEEVAPLUG
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index dec6681986d..bf46503afd0 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -21,6 +21,7 @@
 
 ident		SN9G45
 
+include		"std.arm"
 include "../at91/std.sn9g45"
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common
index ac71169d343..88c9b9af618 100644
--- a/sys/arm/conf/SOCKIT.common
+++ b/sys/arm/conf/SOCKIT.common
@@ -18,6 +18,7 @@
 #
 # $FreeBSD$
 
+include		"std.armv6"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index 87a40d588f8..ab9fe5beee0 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -5,6 +5,7 @@
 #
 
 ident		TS7800
+include		"std.arm"
 include		"../mv/orion/std.ts7800"
 
 options 	SOC_MV_ORION
diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB
index c02d18c1981..4d2ba309049 100644
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@@ -22,6 +22,7 @@ ident		VERSATILEPB
 machine		arm	armv6
 cpu 		CPU_ARM1176
 
+include		"std.armv6"
 files		"../versatile/files.versatile"
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT
index c4f9405c550..48bd5468eea 100644
--- a/sys/arm/conf/VIRT
+++ b/sys/arm/conf/VIRT
@@ -20,6 +20,7 @@
 
 ident		VIRT
 
+include		"std.arm"
 include		"../qemu/std.virt"
 
 options 	HZ=100
@@ -57,7 +58,6 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	PLATFORM
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index eda4815d76e..b4d05ddb838 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -19,6 +19,7 @@
 # $FreeBSD$
 
 ident		VYBRID
+include		"std.armv6"
 include		"../freescale/vybrid/std.vybrid"
 
 makeoptions	WERROR="-Werror"
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index 7ba3b7db020..8453823463d 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -21,6 +21,7 @@
 
 ident		ZEDBOARD
 
+include		"std.armv6"
 include 	"../xilinx/zedboard/std.zedboard"
 
 options 	SCHED_ULE		# ULE scheduler
@@ -56,7 +57,6 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 options 	SMP			# Enable multiple cores
-options 	ARM_NEW_PMAP		# Enable the new v6 pmap
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
diff --git a/sys/arm/conf/std.arm b/sys/arm/conf/std.arm
new file mode 100644
index 00000000000..88675f095e8
--- /dev/null
+++ b/sys/arm/conf/std.arm
@@ -0,0 +1,5 @@
+# Standard kernel config items for all ARMv4/v5 systems.
+#
+# $FreeBSD$
+
+
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
new file mode 100644
index 00000000000..85040e2f37a
--- /dev/null
+++ b/sys/arm/conf/std.armv6
@@ -0,0 +1,6 @@
+# Standard kernel config items for all ARMv6/v7 systems.
+#
+# $FreeBSD$
+
+options 	ARM_NEW_PMAP		# Use new pmap code.
+