Index: head/sys/arm/conf/DB-78XXX
===================================================================
--- head/sys/arm/conf/DB-78XXX	(revision 354933)
+++ head/sys/arm/conf/DB-78XXX	(revision 354934)
@@ -1,80 +1,81 @@
 #
 # Custom kernel for Marvell DB-78xx boards.
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		DB-88F78XX
 include 	"std.arm"
 include 	"../mv/discovery/std.db78xxx"
 
 options 	SOC_MV_DISCOVERY
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	TMPFS			# Efficient memory filesystem
 options 	FFS			# Berkeley Fast Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=mge0
 
 #options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 device		pci
 
 # Pseudo devices
 device		loop
 device		md
 
 # Serial ports
 device		uart
 
 # Networking
 device		ether
 device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		mdio
 device		e1000phy
 device		bpf
 
 # USB
 device		usb
 device		ehci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 device		twsi
 device		ds133x
 
 # SATA
 device		mvs
 
 # GPIO
 device		gpio
 
 # Flattened Device Tree
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=db78100.dts
Index: head/sys/arm/conf/DB-88F5XXX
===================================================================
--- head/sys/arm/conf/DB-88F5XXX	(revision 354933)
+++ head/sys/arm/conf/DB-88F5XXX	(revision 354934)
@@ -1,81 +1,82 @@
 #
 # Custom kernel for Marvell DB-88F5xxx boards.
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		DB-88F5XXX
 include 	"std.arm"
 include 	"../mv/orion/std.db88f5xxx"
 
 options 	SOC_MV_ORION
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	TMPFS			# Efficient memory filesystem
 options 	FFS			# Berkeley Fast Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=mge0
 
 #options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 device		pci
 
 # Pseudo devices
 device		md
 device		loop
 
 # Serial ports
 device		uart
 
 # Networking
 device		ether
 device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		mdio
 device		e1000phy
 device		bpf
 options 	DEVICE_POLLING
 options 	HZ=1000
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 device		twsi
 device		ds133x
 
 # USB
 device		usb
 device		ehci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # SATA
 device		mvs
 
 # GPIO
 device		gpio
 
 # Flattened Device Tree
 options 	FDT
 makeoptions	FDT_DTS_FILE=db88f5281.dts
Index: head/sys/arm/conf/DB-88F6XXX
===================================================================
--- head/sys/arm/conf/DB-88F6XXX	(revision 354933)
+++ head/sys/arm/conf/DB-88F6XXX	(revision 354934)
@@ -1,84 +1,85 @@
 #
 # Custom kernel for Marvell DB-88F6xxx boards.
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		DB-88F6XXX
 include 	"std.arm"
 include 	"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	FFS			# Berkeley Fast Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=mge0
 
 #options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 device		pci
 
 # Pseudo devices
 device		loop
 device		md
 
 # Serial ports
 device		uart
 
 # Networking
 device		ether
 device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		mdio
 device		e1000phy
 device		bpf
 
 device		cesa			# Marvell security engine
 device		crypto
 device		cryptodev
 
 # USB
 device		usb
 device		ehci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 device		twsi
 
 # SATA
 device		mvs
 
 # GPIO
 device		gpio
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=db88f6281.dts
Index: head/sys/arm/conf/RT1310
===================================================================
--- head/sys/arm/conf/RT1310	(revision 354933)
+++ head/sys/arm/conf/RT1310	(revision 354934)
@@ -1,78 +1,79 @@
 #
 # Custom kernel for RT1310 boards.
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		RT1310
 include 	"std.arm"
 include 	"../ralink/std.ralink"
 
 # Flattened Device Tree
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=wzr2-g300n.dts
 
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	FFS			# Berkeley Fast Filesystem
 options 	TMPFS			# Efficient memory filesystem
 options 	MSDOSFS
 
 options 	ROOTDEVNAME=\"cd9660:/dev/cfid0s.rootfs.uzip\"
 
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Debugging
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
 #options 	DEADLKRES		# Enable the deadlock resolver
 #options 	DIAGNOSTIC
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	KDB
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	WITNESS_KDB
 
 # Pseudo devices
 device		loop
 device		md
 device		pty
 
 # Serial ports
 device		uart
 device		uart_ns8250
 
 # Flash
 device		cfi
 device		cfid
 
 # Networking
 device		ether
 device		mii
 device		bpf
 device		fv
 
 # etherswitch
 device		mdio
 device		etherswitch
 device		miiproxy
 device		ip17x
 
 # GPIO
 device		gpio
 device		gpioled
 device		rt1310gpio
 
Index: head/sys/arm/conf/TS7800
===================================================================
--- head/sys/arm/conf/TS7800	(revision 354933)
+++ head/sys/arm/conf/TS7800	(revision 354934)
@@ -1,77 +1,78 @@
 #
 # Custom kernel for the TS-7800 board.
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		TS7800
 include 	"std.arm"
 include 	"../mv/orion/std.ts7800"
 
 options 	SOC_MV_ORION
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=mge0
 
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	TMPFS			# Efficient memory filesystem
 
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 device		mvs
 device		pci
 
 # Pseudo devices
 device		md
 device		loop
 
 # Serial ports
 device		uart
 
 # Networking
 device		ether
 device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		mdio
 device		e1000phy
 device		bpf
 options 	HZ=1000
 
 # USB
 device		usb
 device		ehci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # SATA
 device		ata
 
 # GPIO
 device		gpio
 
 # Flattened Device Tree
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=ts7800.dts