svn commit: r282499 - head/sys/arm/conf

Ian Lepore ian at FreeBSD.org
Tue May 5 16:09:40 UTC 2015


Author: ian
Date: Tue May  5 16:09:25 2015
New Revision: 282499
URL: https://svnweb.freebsd.org/changeset/base/282499

Log:
  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.

Added:
  head/sys/arm/conf/std.arm   (contents, props changed)
  head/sys/arm/conf/std.armv6   (contents, props changed)
Modified:
  head/sys/arm/conf/AML8726
  head/sys/arm/conf/ARMADAXP
  head/sys/arm/conf/ATMEL
  head/sys/arm/conf/AVILA
  head/sys/arm/conf/BEAGLEBONE
  head/sys/arm/conf/BWCT
  head/sys/arm/conf/CAMBRIA
  head/sys/arm/conf/CNS11XXNAS
  head/sys/arm/conf/CRB
  head/sys/arm/conf/CUBIEBOARD
  head/sys/arm/conf/CUBIEBOARD2
  head/sys/arm/conf/DB-78XXX
  head/sys/arm/conf/DB-88F5XXX
  head/sys/arm/conf/DB-88F6XXX
  head/sys/arm/conf/DOCKSTAR
  head/sys/arm/conf/DREAMPLUG-1001
  head/sys/arm/conf/EA3250
  head/sys/arm/conf/EB9200
  head/sys/arm/conf/EFIKA_MX
  head/sys/arm/conf/EP80219
  head/sys/arm/conf/ETHERNUT5
  head/sys/arm/conf/EXYNOS5.common
  head/sys/arm/conf/GUMSTIX
  head/sys/arm/conf/HL200
  head/sys/arm/conf/HL201
  head/sys/arm/conf/IMX53
  head/sys/arm/conf/IMX6
  head/sys/arm/conf/IQ31244
  head/sys/arm/conf/KB920X
  head/sys/arm/conf/LN2410SBC
  head/sys/arm/conf/NSLU
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/QILA9G20
  head/sys/arm/conf/RK3188
  head/sys/arm/conf/RPI-B
  head/sys/arm/conf/RPI2
  head/sys/arm/conf/SAM9260EK
  head/sys/arm/conf/SAM9G20EK
  head/sys/arm/conf/SAM9X25EK
  head/sys/arm/conf/SHEEVAPLUG
  head/sys/arm/conf/SN9G45
  head/sys/arm/conf/SOCKIT.common
  head/sys/arm/conf/TS7800
  head/sys/arm/conf/VERSATILEPB
  head/sys/arm/conf/VIRT
  head/sys/arm/conf/VYBRID
  head/sys/arm/conf/ZEDBOARD

Modified: head/sys/arm/conf/AML8726
==============================================================================
--- head/sys/arm/conf/AML8726	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/AML8726	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,8 @@
 # $FreeBSD$
 
 ident		AML8726
+
+include		"std.armv6"
 include 	"../amlogic/aml8726/std.aml8726"
 
 options 	HZ=100

Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/ARMADAXP	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,8 @@
 # $FreeBSD$
 
 ident		MV-88F78XX0
+
+include		"std.armv6"
 include		"../mv/armadaxp/std.mv78x60"
 
 options 	SOC_MV_ARMADAXP

Modified: head/sys/arm/conf/ATMEL
==============================================================================
--- head/sys/arm/conf/ATMEL	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/ATMEL	Tue May  5 16:09:25 2015	(r282499)
@@ -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

Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/AVILA	Tue May  5 16:09:25 2015	(r282499)
@@ -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"

Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/BEAGLEBONE	Tue May  5 16:09:25 2015	(r282499)
@@ -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 CD
 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

Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/BWCT	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		BWCT
 
+include		"std.arm"
 options 	VERBOSE_INIT_ARM
 
 include		"../at91/std.bwct"

Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/CAMBRIA	Tue May  5 16:09:25 2015	(r282499)
@@ -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"

Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/CNS11XXNAS	Tue May  5 16:09:25 2015	(r282499)
@@ -20,6 +20,7 @@
 
 ident		CNS11XXNAS
 
+include		"std.arm"
 #options 	PHYSADDR=0x10000000
 #options 	KERNPHYSADDR=0x10200000
 #options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm

Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/CRB	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 
 ident		CRB
 
+include		"std.arm"
 options 	PHYSADDR=0x00000000
 options 	KERNPHYSADDR=0x00200000
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm

Modified: head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/CUBIEBOARD	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		CUBIEBOARD
 
+include		"std.armv6"
 include		"../allwinner/std.a10"
 
 options 	HZ=100

Modified: head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- head/sys/arm/conf/CUBIEBOARD2	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/CUBIEBOARD2	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		CUBIEBOARD2
 
+include		"std.armv6"
 include		"../allwinner/a20/std.a20"
 
 options 	HZ=100

Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/DB-78XXX	Tue May  5 16:09:25 2015	(r282499)
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F78XX
+include		"std.arm"
 include		"../mv/discovery/std.db78xxx"
 
 options 	SOC_MV_DISCOVERY

Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/DB-88F5XXX	Tue May  5 16:09:25 2015	(r282499)
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F5XXX
+include		"std.arm"
 include		"../mv/orion/std.db88f5xxx"
 
 options 	SOC_MV_ORION

Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/DB-88F6XXX	Tue May  5 16:09:25 2015	(r282499)
@@ -5,6 +5,7 @@
 #
 
 ident		DB-88F6XXX
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD

Modified: head/sys/arm/conf/DOCKSTAR
==============================================================================
--- head/sys/arm/conf/DOCKSTAR	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/DOCKSTAR	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		DOCKSTAR
 
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dockstar.dts

Modified: head/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- head/sys/arm/conf/DREAMPLUG-1001	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/DREAMPLUG-1001	Tue May  5 16:09:25 2015	(r282499)
@@ -24,6 +24,7 @@
 
 ident		DREAMPLUG-1001
 
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dreamplug-1001.dts

Modified: head/sys/arm/conf/EA3250
==============================================================================
--- head/sys/arm/conf/EA3250	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/EA3250	Tue May  5 16:09:25 2015	(r282499)
@@ -5,6 +5,7 @@
 #
 
 ident		EA3250
+include		"std.arm"
 include		"../lpc/std.lpc"
 hints		"EA3250.hints"
 

Modified: head/sys/arm/conf/EB9200
==============================================================================
--- head/sys/arm/conf/EB9200	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/EB9200	Tue May  5 16:09:25 2015	(r282499)
@@ -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.

Modified: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/EFIKA_MX	Tue May  5 16:09:25 2015	(r282499)
@@ -20,6 +20,7 @@
 
 ident		EFIKA_MX
 
+include		"std.armv6"
 include 	"../freescale/imx/std.imx51"
 
 makeoptions	WITHOUT_MODULES="ahc"

Modified: head/sys/arm/conf/EP80219
==============================================================================
--- head/sys/arm/conf/EP80219	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/EP80219	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 
 ident		EP80219
 
+include		"std.arm"
 options 	PHYSADDR=0xa0000000
 options 	KERNPHYSADDR=0xa0200000	
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm

Modified: head/sys/arm/conf/ETHERNUT5
==============================================================================
--- head/sys/arm/conf/ETHERNUT5	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/ETHERNUT5	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		ETHERNUT5
 
+include		"std.arm"
 include "../at91/std.ethernut5"
 
 # To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/EXYNOS5.common
==============================================================================
--- head/sys/arm/conf/EXYNOS5.common	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/EXYNOS5.common	Tue May  5 16:09:25 2015	(r282499)
@@ -20,6 +20,7 @@
 
 makeoptions	WERROR="-Werror"
 
+include		"std.armv6"
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption

Modified: head/sys/arm/conf/GUMSTIX
==============================================================================
--- head/sys/arm/conf/GUMSTIX	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/GUMSTIX	Tue May  5 16:09:25 2015	(r282499)
@@ -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

Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/HL200	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		HL200
 
+include		"std.arm"
 include "../at91/std.hl200"
 
 #To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/HL201	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		HL201
 
+include		"std.arm"
 include "../at91/std.hl201"
 
 makeoptions	MODULES_OVERRIDE=""

Modified: head/sys/arm/conf/IMX53
==============================================================================
--- head/sys/arm/conf/IMX53	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/IMX53	Tue May  5 16:09:25 2015	(r282499)
@@ -20,6 +20,7 @@
 
 ident		IMX53
 
+include		"std.armv6"
 include 	"../freescale/imx/std.imx53"
 
 options 	SOC_IMX53

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/IMX6	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 # $FreeBSD$
 
 ident		IMX6
+include		"std.armv6"
 include 	"../freescale/imx/std.imx6"
 
 options 	SOC_IMX6

Modified: head/sys/arm/conf/IQ31244
==============================================================================
--- head/sys/arm/conf/IQ31244	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/IQ31244	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 
 ident		IQ31244
 
+include		"std.arm"
 options 	PHYSADDR=0xa0000000
 options 	KERNPHYSADDR=0xa0200000	
 options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/KB920X	Tue May  5 16:09:25 2015	(r282499)
@@ -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.

Modified: head/sys/arm/conf/LN2410SBC
==============================================================================
--- head/sys/arm/conf/LN2410SBC	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/LN2410SBC	Tue May  5 16:09:25 2015	(r282499)
@@ -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.

Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/NSLU	Tue May  5 16:09:25 2015	(r282499)
@@ -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	

Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/PANDABOARD	Tue May  5 16:09:25 2015	(r282499)
@@ -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

Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/QILA9G20	Tue May  5 16:09:25 2015	(r282499)
@@ -22,6 +22,7 @@
 
 ident		QILA9G20
 
+include		"std.arm"
 include "../at91/std.qila9g20"
 
 #To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/RK3188	Tue May  5 16:09:25 2015	(r282499)
@@ -20,6 +20,7 @@
 
 ident		RK3188
 
+include		"std.armv6"
 include		"../rockchip/std.rk30xx"
 
 options 	HZ=100

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/RPI-B	Tue May  5 16:09:25 2015	(r282499)
@@ -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 CD
 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

Modified: head/sys/arm/conf/RPI2
==============================================================================
--- head/sys/arm/conf/RPI2	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/RPI2	Tue May  5 16:09:25 2015	(r282499)
@@ -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 CD
 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

Modified: head/sys/arm/conf/SAM9260EK
==============================================================================
--- head/sys/arm/conf/SAM9260EK	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SAM9260EK	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		SAM9260EK
 
+include		"std.arm"
 include "../at91/std.sam9260ek"
 
 # To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SAM9G20EK	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 
 ident		SAM9G20EK
 
+include		"std.arm"
 include "../at91/std.sam9g20ek"
 
 #To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/SAM9X25EK
==============================================================================
--- head/sys/arm/conf/SAM9X25EK	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SAM9X25EK	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		SAM9X25EK
 
+include		"std.arm"
 include "../at91/std.sam9x25ek"
 
 #To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- head/sys/arm/conf/SHEEVAPLUG	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SHEEVAPLUG	Tue May  5 16:09:25 2015	(r282499)
@@ -6,6 +6,7 @@
 #NO_UNIVERSE
 
 ident		SHEEVAPLUG
+include		"std.arm"
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD

Modified: head/sys/arm/conf/SN9G45
==============================================================================
--- head/sys/arm/conf/SN9G45	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SN9G45	Tue May  5 16:09:25 2015	(r282499)
@@ -21,6 +21,7 @@
 
 ident		SN9G45
 
+include		"std.arm"
 include "../at91/std.sn9g45"
 
 #To statically compile in device wiring instead of /boot/device.hints

Modified: head/sys/arm/conf/SOCKIT.common
==============================================================================
--- head/sys/arm/conf/SOCKIT.common	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/SOCKIT.common	Tue May  5 16:09:25 2015	(r282499)
@@ -18,6 +18,7 @@
 #
 # $FreeBSD$
 
+include		"std.armv6"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""

Modified: head/sys/arm/conf/TS7800
==============================================================================
--- head/sys/arm/conf/TS7800	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/TS7800	Tue May  5 16:09:25 2015	(r282499)
@@ -5,6 +5,7 @@
 #
 
 ident		TS7800
+include		"std.arm"
 include		"../mv/orion/std.ts7800"
 
 options 	SOC_MV_ORION

Modified: head/sys/arm/conf/VERSATILEPB
==============================================================================
--- head/sys/arm/conf/VERSATILEPB	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/VERSATILEPB	Tue May  5 16:09:25 2015	(r282499)
@@ -22,6 +22,7 @@ ident		VERSATILEPB
 machine		arm	armv6
 cpu 		CPU_ARM1176
 
+include		"std.armv6"
 files		"../versatile/files.versatile"
 makeoptions	MODULES_OVERRIDE=""
 

Modified: head/sys/arm/conf/VIRT
==============================================================================
--- head/sys/arm/conf/VIRT	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/VIRT	Tue May  5 16:09:25 2015	(r282499)
@@ -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 CD
 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

Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/VYBRID	Tue May  5 16:09:25 2015	(r282499)
@@ -19,6 +19,7 @@
 # $FreeBSD$
 
 ident		VYBRID
+include		"std.armv6"
 include		"../freescale/vybrid/std.vybrid"
 
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD	Tue May  5 15:48:25 2015	(r282498)
+++ head/sys/arm/conf/ZEDBOARD	Tue May  5 16:09:25 2015	(r282499)
@@ -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 CD
 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

Added: head/sys/arm/conf/std.arm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/conf/std.arm	Tue May  5 16:09:25 2015	(r282499)
@@ -0,0 +1,5 @@
+# Standard kernel config items for all ARMv4/v5 systems.
+#
+# $FreeBSD$
+
+

Added: head/sys/arm/conf/std.armv6
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/conf/std.armv6	Tue May  5 16:09:25 2015	(r282499)
@@ -0,0 +1,6 @@
+# Standard kernel config items for all ARMv6/v7 systems.
+#
+# $FreeBSD$
+
+options 	ARM_NEW_PMAP		# Use new pmap code.
+


More information about the svn-src-head mailing list