Index: head/sys/arm/conf/ALLWINNER
===================================================================
--- head/sys/arm/conf/ALLWINNER	(revision 308404)
+++ head/sys/arm/conf/ALLWINNER	(revision 308405)
@@ -1,135 +1,137 @@
 #
 # ALLWINNER -- Custom configuration for the Allwinner A20, A31, A31S, A83T,
 # and H3 ARM SoCs.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
+#
+#NO_UNIVERSE
 
 ident		ALLWINNER
 
 include 	"std.armv6"
 include 	"../allwinner/std.allwinner"
 
 options 	INTRNG
 
 options 	SOC_ALLWINNER_A20
 options 	SOC_ALLWINNER_A31
 options 	SOC_ALLWINNER_A31S
 options 	SOC_ALLWINNER_A83T
 options 	SOC_ALLWINNER_H3
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
 options 	PLATFORM_SMP
 options 	MULTIDELAY
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=dwc0
 
 # EXT_RESOURCES pseudo devices
 options 	EXT_RESOURCES
 device		clk
 device		phy
 device		hwreset
 device		regulator
 
 # CPU frequency control
 device		cpufreq
 
 # Interrupt controller
 device		gic
 
 # ARM Generic Timer
 device		generic_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # ATA controllers
 device		ahci			# AHCI-compatible SATA controllers
 #device		ata			# Legacy ATA/SATA controllers
 
 # Console and misc
 device		uart
 device		uart_snps
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 
 # I2C support
 device		iicbus
 device		iic
 device		twsi
 device		rsb
 device		axp209			# AXP209 Power Management Unit
 device		axp81x			# AXP813/818 Power Management Unit
 device		sy8106a			# SY8106A Buck Regulator
 
 # GPIO
 device		gpio
 device		gpioled
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		uhci
 device		ohci
 device		ehci
 
 device		umass
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		bpf
 
 #device		emac			# 10/100 integrated EMAC controller
 device		dwc			# 10/100/1000 integrated GMAC controller
 device		awg			# 10/100/1000 integrated EMAC controller
 
 # USB ethernet support, requires miibus
 device		miibus
 
 # Sound support
 device		sound
 
 # Framebuffer support
 device		vt
 device		kbdmux
 device		ums
 device		ukbd
 device		videomode
 device		hdmi
 
 # Pinmux
 device		fdt_pinctrl
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA=dtb/allwinner
Index: head/sys/arm/conf/RPI2
===================================================================
--- head/sys/arm/conf/RPI2	(revision 308404)
+++ head/sys/arm/conf/RPI2	(revision 308405)
@@ -1,102 +1,104 @@
 #
 # RPI2 -- Custom configuration for the Raspberry Pi 2
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
+#
+#NO_UNIVERSE
 
 ident		RPI2
 
 include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"
 
 options 	INTRNG
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
 options 	PLATFORM_SMP
 options 	MULTIDELAY
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 # ARM Generic Timer
 device		generic_timer
 
 device		bpf
 device		loop
 device		ether
 device		uart
 device		pty
 device		snp
 device		pl011
 
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
 device		ukbd
 
 device		sdhci
 device		mmc
 device		mmcsd
 
 device		gpio
 device		gpioled
 
 # I2C
 device		iic
 device		iicbus
 device		bcm2835_bsc
 
 device		md
 device		random			# Entropy device
 
 # USB support
 device		usb
 device		dwcotg			# DWC OTG controller
 
 # USB storage support
 device		scbus
 device		da
 device		umass
 
 # USB ethernet support
 device		smcphy
 device		mii
 device		smsc
 
 # SPI
 device		spibus
 device		bcm2835_spi
 
 device		vchiq
 device		sound
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 # Note:  DTB is normally loaded and modified by RPi boot loader, then
 # handed to kernel via U-Boot and ubldr.
 #options 	FDT_DTB_STATIC
 #makeoptions	FDT_DTS_FILE=rpi2.dts
 makeoptions	MODULES_EXTRA="dtb/rpi rpi_ft5406"