Index: head/sys/mips/conf/ALFA_HORNET_UB
===================================================================
--- head/sys/mips/conf/ALFA_HORNET_UB	(revision 291048)
+++ head/sys/mips/conf/ALFA_HORNET_UB	(revision 291049)
@@ -1,57 +1,59 @@
 #
 # Alfa Networks Hornet UB - an AR933x based SoC wifi device.
 #
 # http://www.alfa.com.tw/products_show.php?pc=99&ps=50
 #
 # This is for the 64MB RAM/16MB flash part.  They also
 # do various other versions; they have different RAM/flash
 # configurations.
 #
 # * AR9330 SoC
 # * 64MB RAM
 # * 16MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
 ident           ALFA_HORNET_UB
 
 # Override hints with board values
 hints           "ALFA_HORNET_UB.hints"
 
 # Board memory - 64MB
 options         AR71XX_REALMEM=(64*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/AP121
===================================================================
--- head/sys/mips/conf/AP121	(revision 291048)
+++ head/sys/mips/conf/AP121	(revision 291049)
@@ -1,51 +1,53 @@
 #
 # AP121 - the AP121 reference board from Qualcomm Atheros includes:
 #
 # * AR9330 SoC
 # * 16MB RAM
 # * 4MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
 ident           AP121
 
 # Override hints with board values
 hints           "AP121.hints"
 
 # Force the board memory - the base AP121 only has 16MB RAM
 options         AR71XX_REALMEM=(16*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/AP135
===================================================================
--- head/sys/mips/conf/AP135	(revision 291048)
+++ head/sys/mips/conf/AP135	(revision 291049)
@@ -1,68 +1,70 @@
 #
 # AP135 - the QCA955x SoC reference design
 #
 # This contains a QCA9558 MIPS74k SoC with on-board 3x3 2GHz wifi,
 # 128MiB RAM, an AR8327 5-port gigabit ethernet switch and
 # a QCA 11ac 5GHz AP NIC.
 #
 # The to things not currently support are the QCA 11ac NIC and
 # PCIe host controllers - there's two of them, and the existing
 # PCIe code here doesn't support that just yet.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
 ident           AP135
 
 # Override hints with board values
 hints           "AP135.hints"
 
 # Force the board memory - the base AP135 has 128MB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # yes, this board has a PCIe connected atheros device
 # add ath_pci so it can at least attach things when there's a
 # ath(4) in there, rather than the 11ac chip we don't support.
 device		pci
 device		qca955x_pci
 
 device		ath_pci
 options 	AR71XX_ATH_EEPROM
 device		firmware		# Used by the above
 options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # Default to accept
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
Index: head/sys/mips/conf/AP143
===================================================================
--- head/sys/mips/conf/AP143	(revision 291048)
+++ head/sys/mips/conf/AP143	(revision 291049)
@@ -1,51 +1,53 @@
 #
 # AP143 - the AP143 reference board from Qualcomm Atheros includes:
 #
 # * AR9330 SoC
 # * 32MB RAM
 # * 4MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA953x parameters
 include         "QCA953X_BASE"
 
 ident           AP143
 
 # Override hints with board values
 hints           "AP143.hints"
 
 # Force the board memory - the base AP121 only has 16MB RAM
 options         AR71XX_REALMEM=(32*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/AP91
===================================================================
--- head/sys/mips/conf/AP91	(revision 291048)
+++ head/sys/mips/conf/AP91	(revision 291049)
@@ -1,64 +1,66 @@
 #
 # Specific board setup for the Atheros AP91 reference board.
 #
 # The AP91 has the following hardware:
 #
 # + AR7241 CPU SoC
 # + AR9287 Wifi
 # + Integrated switch (XXX speed?)
 # + 4MB flash
 # + 16MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP91"
 hints		"AP91.hints"
 
 options 	AR71XX_REALMEM=16*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # Limit inlines
 makeoptions	INLINE_LIMIT=768
 
 # We bite the performance overhead for now; the kernel won't
 # fit if the mutexes are inlined.
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	SX_NOINLINE
 
 # There's no need to enable swapping on this platform.
 options 	NO_SWAPPING
 
 # For DOS - enable if required
 # options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # Not enough space for these..
 nooptions 	INVARIANTS
 nooptions 	INVARIANT_SUPPORT
 nooptions 	WITNESS
 nooptions 	WITNESS_SKIPSPIN
 nooptions 	DEBUG_REDZONE
 nooptions 	DEBUG_MEMGUARD
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
Index: head/sys/mips/conf/AP93
===================================================================
--- head/sys/mips/conf/AP93	(revision 291048)
+++ head/sys/mips/conf/AP93	(revision 291049)
@@ -1,44 +1,46 @@
 #
 # Specific board setup for the Atheros AP91 reference board.
 #
 # The AP93 has the following hardware:
 #
 # + AR7240 CPU SoC
 # + AR9280 Wifi
 # + Integrated switch (XXX speed?)
 # + 16MB flash
 # + 64MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"AP93"
 hints		"AP93.hints"
 
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # For DOS - enable if required
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
Index: head/sys/mips/conf/AP94
===================================================================
--- head/sys/mips/conf/AP94	(revision 291048)
+++ head/sys/mips/conf/AP94	(revision 291049)
@@ -1,35 +1,37 @@
 #
 # Specific board setup for the Atheros AP94 reference board.
 #
 # The AP94 has the following hardware:
 #
 # + AR7161 CPU SoC
 # + AR9223 2.4GHz 11n
 # + AR9220 5GHz 11n
 # + AR8216 10/100 switch
 # + m25p64 based 8MB flash
 # + 32mb RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP94"
 hints		"AP94.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
 device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 options 	AR71XX_REALMEM=32*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # options 	MD_ROOT
 # options 	MD_ROOT_SIZE="6144"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
Index: head/sys/mips/conf/AP96
===================================================================
--- head/sys/mips/conf/AP96	(revision 291048)
+++ head/sys/mips/conf/AP96	(revision 291049)
@@ -1,45 +1,47 @@
 #
 # Specific board setup for the Atheros AP96 reference board.
 #
 # The AP96 has the following hardware:
 #
 # + AR7161 CPU SoC
 # + AR9223 2.4GHz 11n
 # + AR9220 5GHz 11n
 # + AR8316 10/100/1000 switch
 # + m25p64 based 8MB flash
 # + 64mb RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"AP96"
 hints		"AP96.hints"
 
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # For DOS - enable if required
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
Index: head/sys/mips/conf/BERI_DE4_MDROOT
===================================================================
--- head/sys/mips/conf/BERI_DE4_MDROOT	(revision 291048)
+++ head/sys/mips/conf/BERI_DE4_MDROOT	(revision 291049)
@@ -1,19 +1,21 @@
 #
 # BERI_DE4_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC # Implementation) FPGA soft core, as configured in its Terasic DE-4
 # reference configuration.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_MDROOT
 
 #
 # This kernel configuration uses an embedded 8MB memory root file system.
 # Adjust the following path based on local requirements.
 #
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=26112	# 25.5MB
 options 	ROOTDEVNAME=\"ufs:md0\"
Index: head/sys/mips/conf/BERI_DE4_SDROOT
===================================================================
--- head/sys/mips/conf/BERI_DE4_SDROOT	(revision 291048)
+++ head/sys/mips/conf/BERI_DE4_SDROOT	(revision 291049)
@@ -1,16 +1,18 @@
 #
 # BERI_DE4_SDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured in its Terasic DE-4
 # reference configuration.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_DE4_BASE"
 
 ident		BERI_DE4_SDROOT
 
 #
 # This kernel expects to find its root filesystem on the SD Card.
 #
 options 	ROOTDEVNAME=\"ufs:/dev/altera_sdcard0\"
Index: head/sys/mips/conf/BERI_SIM_MDROOT
===================================================================
--- head/sys/mips/conf/BERI_SIM_MDROOT	(revision 291048)
+++ head/sys/mips/conf/BERI_SIM_MDROOT	(revision 291049)
@@ -1,18 +1,20 @@
 #
 # BERI_SIM_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured for simulation.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_MDROOT
 
 #
 # This kernel configuration uses an embedded memory root file system.
 # Adjust the following path based on local requirements.
 #
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=26112	# 25.5MB
 options 	ROOTDEVNAME=\"ufs:md0\"
Index: head/sys/mips/conf/BERI_SIM_SDROOT
===================================================================
--- head/sys/mips/conf/BERI_SIM_SDROOT	(revision 291048)
+++ head/sys/mips/conf/BERI_SIM_SDROOT	(revision 291049)
@@ -1,15 +1,17 @@
 #
 # BERI_SIM_SDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured for simulation.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_SDROOT
 
 #
 # This kernel expects to find its root filesystem on the SD Card.
 #
 options 	ROOTDEVNAME=\"ufs:/dev/altera_sdcard0\"
Index: head/sys/mips/conf/BERI_SIM_VIRTIO
===================================================================
--- head/sys/mips/conf/BERI_SIM_VIRTIO	(revision 291048)
+++ head/sys/mips/conf/BERI_SIM_VIRTIO	(revision 291049)
@@ -1,20 +1,22 @@
 #
 # BERI_SIM_VIRTIO -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
 # RISC Implementation) FPGA soft core, as configured for simulation.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "BERI_SIM_BASE"
 
 ident		BERI_SIM_VIRTIO
 
 device		virtio
 device		virtio_blk
 device		virtio_mmio
 device		altera_pio
 
 #
 # This kernel expects to find its root filesystem on the SD Card.
 #
 options 	ROOTDEVNAME=\"ufs:/dev/vtbd0\"
Index: head/sys/mips/conf/CARAMBOLA2
===================================================================
--- head/sys/mips/conf/CARAMBOLA2	(revision 291048)
+++ head/sys/mips/conf/CARAMBOLA2	(revision 291049)
@@ -1,53 +1,55 @@
 #
 # Carambola 2 - an AR933x based SoC wifi device.
 #
 # http://shop.8devices.com/wifi4things/carambola2
 #
 # * AR9330 SoC
 # * 64MB RAM
 # * 16MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
 ident           CARAMBOLA2
 
 # Override hints with board values
 hints           "CARAMBOLA2.hints"
 
 # Board memory - 64MB
 options         AR71XX_REALMEM=(64*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/DB120
===================================================================
--- head/sys/mips/conf/DB120	(revision 291048)
+++ head/sys/mips/conf/DB120	(revision 291049)
@@ -1,52 +1,54 @@
 #
 # DB120 - the AR9344 SoC reference design
 #
 # $FreeBSD$
 #
 
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 
+#NO_UNIVERSE
+
 ident           DB120
 
 # Override hints with board values
 hints           "DB120.hints"
 
 # Force the board memory - the base DB120 has 128MB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # yes, this board has a PCI connected atheros device
 device		ath_pci
 options 	AR71XX_ATH_EEPROM
 device		firmware		# Used by the above
 options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/DIR-655A1
===================================================================
--- head/sys/mips/conf/DIR-655A1	(revision 291048)
+++ head/sys/mips/conf/DIR-655A1	(revision 291049)
@@ -1,56 +1,58 @@
 #
 # DIR-655A1 - 3x3 2GHz D-Link AP
 #
 # This contains a QCA9558 MIPS74k SoC with on-board 3x3 2GHz wifi,
 # 128MiB RAM, an AR8327 5-port gigabit ethernet switch.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
 ident           DIR-655A1
 
 # Override hints with board values
 hints           "DIR-655A1.hints"
 
 # Force the board memory - the base AP135 has 128MB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 options 	AR71XX_ATH_EEPROM
 device		firmware		# Used by the above
 options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # Default to accept
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
Index: head/sys/mips/conf/DIR-825B1
===================================================================
--- head/sys/mips/conf/DIR-825B1	(revision 291048)
+++ head/sys/mips/conf/DIR-825B1	(revision 291049)
@@ -1,71 +1,73 @@
 #
 # Specific board setup for the D-Link DIR-825B1 router.
 #
 # The DIR-825B1 has the following hardware:
 #
 # + AR7161 CPU SoC
 # + AR9223 2.4GHz 11n
 # + AR9220 5GHz 11n
 # + RealTek RTL8366S Gigabit switch
 # + m25p64 based 8MB flash
 # + 64MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"DIR-825B1"
 hints		"DIR-825B1.hints"
 
 # Since the kernel image must fit inside 1024KiB, we have to build almost
 # everything as modules.
 # nodevice random
 nodevice gpio
 nodevice gpioled
 nodevice gif
 nodevice gre
 nodevice if_bridge
 nodevice usb
 nodevice ehci
 nodevice wlan
 nodevice wlan_xauth
 nodevice wlan_acl
 nodevice wlan_wep
 nodevice wlan_tkip
 nodevice wlan_ccmp
 nodevice wlan_rssadapt
 nodevice wlan_amrr
 nodevice ath
 nodevice ath_pci
 nodevice ath_hal
 nodevice umass
 nodevice ath_rate_sample
 
 nooptions	INET6
 
 # Don't include the SCSI/CAM strings in the default build
 options 	SCSI_NO_SENSE_STRINGS
 options 	SCSI_NO_OP_STRINGS
 
 # .. And no sysctl strings
 options 	NO_SYSCTL_DESCR
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem hackery!
 options 	GEOM_UNCOMPRESS
 options 	GEOM_PART_GPT
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # options 	MSDOSFS			# Read MSDOS filesystems; useful for USB/CF
 
 # options 	MD_ROOT
 # options 	MD_ROOT_SIZE="6144"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
Index: head/sys/mips/conf/DIR-825C1
===================================================================
--- head/sys/mips/conf/DIR-825C1	(revision 291048)
+++ head/sys/mips/conf/DIR-825C1	(revision 291049)
@@ -1,66 +1,68 @@
 # $FreeBSD$
 #
 # Specific board setup for the D-Link DIR-825C1 router.
 #
 # The DIR-825C1 has the following hardware:
 #
 # + AR9344 CPU SoC 74k MIPS
 # + ARxxx 2.4GHz 11n
 # + ARXXX 5GHz 11n
 # + AR8327 Gigabit switch
 # + m25p80 based 16MB flash
 # + 128MB RAM
 # + uboot environment
 
+#NO_UNIVERSE
+
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 ident           DIR825C1
 
 # Override hints with board values
 hints           "DIR-825C1.hints"
 
 # Force the board memory - the base DB120 has 128MB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 device		gpioiic
 device		iicbb
 device		iicbus
 device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 options		MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options		AR71XX_ENV_UBOOT
 
 # Used for the static uboot partition map
 device          geom_map
 
 # uzip - to boot natively from flash
 options 	GEOM_UNCOMPRESS
 options         GEOM_PART_GPT
 
 # yes, this board has a PCI connected atheros device
 device          ath_pci
 options         AR71XX_ATH_EEPROM
 device          firmware                # Used by the above
 options         ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options         ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # In order to netboot, you have to build the mfsroot into the kernel
 # 19443712 or 19M is the biggest rootfs via netboot this thing supports
 #options         MD_ROOT         # md device usable as a potential root device
 #options         MD_ROOT_SIZE=19444
 #makeoptions     MFS_IMAGE=/tftpboot/mfsroot-dir825c1.img.ulzma
 #options         ROOTDEVNAME=\"ufs:md0.uncompress\"
Index: head/sys/mips/conf/ENH200
===================================================================
--- head/sys/mips/conf/ENH200	(revision 291048)
+++ head/sys/mips/conf/ENH200	(revision 291049)
@@ -1,44 +1,46 @@
 #
 # Specific board setup for the Engenius ENH-200 802.11bgn mesh node.
 #
 # The Engenius ENH-200 has the following hardware:
 #
 # + AR7240 CPU SoC
 # + AR9285 Wifi
 # + Integrated switch
 # + 8MB flash
 # + 32MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"ENH200"
 hints		"ENH200.hints"
 
 options 	AR71XX_REALMEM=32*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # For DOS - enable if required
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
Index: head/sys/mips/conf/ONIONOMEGA
===================================================================
--- head/sys/mips/conf/ONIONOMEGA	(revision 291048)
+++ head/sys/mips/conf/ONIONOMEGA	(revision 291049)
@@ -1,53 +1,55 @@
 #
 # Onion Omega - an AR9330 based SoC
 #
 # https://onion.io/omega/
 #
 # * AR9330 SoC
 # * 64MB RAM
 # * 16MB flash
 # * Integrated 1x1 2GHz wifi and optional 10/100 ethernet
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
 ident           ONIONOMEGA
 
 # Override hints with board values
 hints           "ONIONOMEGA.hints"
 
 # Board memory - 64MB
 options         AR71XX_REALMEM=(64*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/PB47
===================================================================
--- head/sys/mips/conf/PB47	(revision 291048)
+++ head/sys/mips/conf/PB47	(revision 291049)
@@ -1,40 +1,42 @@
 #
 # Atheros PB47 reference board.
 #
 # * one MiniPCI+ slot (modified to allow two idsel lines
 #   on the one slot, for a specific kind of internal-only
 #   NIC;
 # * one XMII slot
 # * One ethernet PHY
 # * Akros Silicon AS1834
 # * 8MB NOR SPI flash
 # * 64MB RAM
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"PB47"
 hints		"PB47.hints"
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # XXX TODO: add uboot boot parameter parsing to extract MAC, RAM.
 # Right now it will just detect 32mb out of 64mb, as well as
 # return a garbage MAC address.
 options 	AR71XX_REALMEM=64*1024*1024
 
 # For DOS - enable if required
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device		geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/PICOSTATION_M2HP
===================================================================
--- head/sys/mips/conf/PICOSTATION_M2HP	(revision 291048)
+++ head/sys/mips/conf/PICOSTATION_M2HP	(revision 291049)
@@ -1,68 +1,70 @@
 #
 # Specific board setup for the Picostation M2 HP board.
 #
 # This board has the following hardware:
 #
 # + AR7241 CPU SoC
 # + AR9287 Wifi
 # + Integrated switch (XXX speed?)
 # + 8MB flash
 # + 32MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"PICOSTATION_M2HP"
 hints		"PICOSTATION_M2HP.hints"
 
 options 	AR71XX_REALMEM=32*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # Limit inlines
 makeoptions	INLINE_LIMIT=768
 
 # We bite the performance overhead for now; the kernel won't
 # fit if the mutexes are inlined.
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	SX_NOINLINE
 
 # There's no need to enable swapping on this platform.
 options 	NO_SWAPPING
 
 # For DOS - enable if required
 # options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # Not enough space for these..
 nooptions 	INVARIANTS
 nooptions 	INVARIANT_SUPPORT
 nooptions 	WITNESS
 nooptions 	WITNESS_SKIPSPIN
 nooptions 	DEBUG_REDZONE
 nooptions 	DEBUG_MEMGUARD
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # Enable GPIO
 device         gpio
 device         gpioled
Index: head/sys/mips/conf/ROUTERSTATION
===================================================================
--- head/sys/mips/conf/ROUTERSTATION	(revision 291048)
+++ head/sys/mips/conf/ROUTERSTATION	(revision 291049)
@@ -1,28 +1,30 @@
 #
 # Ubiquiti Routerstation: Boot from onboard flash
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION"
 hints		"ROUTERSTATION.hints"
 
 # XXX Is there an RTC on the RS?
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem support
 options 	GEOM_UNCOMPRESS
 
 # For DOS
 options 	MSDOSFS
 
 # Etherswitch support
 options 	ARGE_MDIO
 device		miiproxy
 device		etherswitch
 device		ukswitch
 
 # Boot path - redboot MFS
 options 	ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
Index: head/sys/mips/conf/ROUTERSTATION_MFS
===================================================================
--- head/sys/mips/conf/ROUTERSTATION_MFS	(revision 291048)
+++ head/sys/mips/conf/ROUTERSTATION_MFS	(revision 291049)
@@ -1,19 +1,21 @@
 #
 # Ubiquiti Routerstation: boot from MFS
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION_MFS"
 hints		"ROUTERSTATION.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
 device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 options 	MD_ROOT
 options 	MD_ROOT_SIZE="6144"
Index: head/sys/mips/conf/RSPRO
===================================================================
--- head/sys/mips/conf/RSPRO	(revision 291048)
+++ head/sys/mips/conf/RSPRO	(revision 291049)
@@ -1,30 +1,32 @@
 #
 # Routerstation Pro: boot from on-board flash
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO"
 hints		"RSPRO.hints"
 
 # RTC - requires hackery in the spibus code to work
 device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem support
 options 	GEOM_UNCOMPRESS
 
 # For DOS
 options 	MSDOSFS
 
 # For etherswitch support
 options 	ARGE_MDIO
 device		miiproxy
 device		etherswitch
 device		arswitch
 
 # Boot off of flash
 options 	ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
 
Index: head/sys/mips/conf/RSPRO_MFS
===================================================================
--- head/sys/mips/conf/RSPRO_MFS	(revision 291048)
+++ head/sys/mips/conf/RSPRO_MFS	(revision 291049)
@@ -1,23 +1,25 @@
 #
 # Ubiquiti Routerstation Pro: boot from MFS
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"RSPRO_MFS"
 hints		"RSPRO.hints"
 
 # RTC - requires hackery in the spibus code to work
 device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
 device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 # Boot from the first MFS uzip
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 options 	MD_ROOT
 options 	MD_ROOT_SIZE="6144"
Index: head/sys/mips/conf/TL-ARCHERC7V2
===================================================================
--- head/sys/mips/conf/TL-ARCHERC7V2	(revision 291048)
+++ head/sys/mips/conf/TL-ARCHERC7V2	(revision 291049)
@@ -1,68 +1,70 @@
 #
 # TP-Link Archer C7 - based on the AP135 reference design.
 #
 # This contains a QCA9558 MIPS74k SoC with on-board 3x3 2GHz wifi,
 # 128MiB RAM, an AR8327 5-port gigabit ethernet switch and
 # a QCA 11ac 5GHz AP NIC.
 #
 # The to things not currently support are the QCA 11ac NIC and
 # PCIe host controllers - there's two of them, and the existing
 # PCIe code here doesn't support that just yet.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
 ident           TL-ARCHERC7V2
 
 # Override hints with board values
 hints           "TL-ARCHERC7V2.hints"
 
 # Force the board memory - this has 128MiB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # yes, this board has a PCIe connected atheros device
 # add ath_pci so it can at least attach things when there's a
 # ath(4) in there, rather than the 11ac chip we don't support.
 device		pci
 device		qca955x_pci
 
 device		ath_pci
 options 	AR71XX_ATH_EEPROM
 device		firmware		# Used by the above
 options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # Default to accept
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
Index: head/sys/mips/conf/TL-WDR4300
===================================================================
--- head/sys/mips/conf/TL-WDR4300	(revision 291048)
+++ head/sys/mips/conf/TL-WDR4300	(revision 291049)
@@ -1,52 +1,54 @@
 #
 # TPLink TL-WDR4300 - AR9344 based dual-band 2x2 wifi
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR934x parameters
 include         "AR934X_BASE"
 
 ident           TL-WDR4300
 
 # Override hints with board values
 hints           "TL-WDR4300.hints"
 
 # Force the board memory - the base DB120 has 128MB RAM
 options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # yes, this board has a PCI connected atheros device
 device		ath_pci
 options 	AR71XX_ATH_EEPROM
 device		firmware		# Used by the above
 options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
Index: head/sys/mips/conf/TL-WR1043NDv2
===================================================================
--- head/sys/mips/conf/TL-WR1043NDv2	(revision 291048)
+++ head/sys/mips/conf/TL-WR1043NDv2	(revision 291049)
@@ -1,51 +1,53 @@
 #
 # TP-Link TL-WR1043nd v2 - based on the AP135 reference design.
 #
 # This contains a QCA9558 MIPS74k SoC with on-board 3x3 2GHz wifi,
 # 64MiB RAM and an AR8327 5-port gigabit ethernet switch.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default QCA955x parameters
 include         "QCA955X_BASE"
 
 ident           TL-WR1043NDv2
 
 # Override hints with board values
 hints           "TL-WR1043NDv2.hints"
 
 options         AR71XX_REALMEM=(64*1024*1024)
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # yes, this board has a PCI connected atheros device
 #device		ath_pci
 #options 	AR71XX_ATH_EEPROM
 #device		firmware		# Used by the above
 #options 	ATH_EEPROM_FIRMWARE
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # Default to accept
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
Index: head/sys/mips/conf/TL-WR740Nv4
===================================================================
--- head/sys/mips/conf/TL-WR740Nv4	(revision 291048)
+++ head/sys/mips/conf/TL-WR740Nv4	(revision 291049)
@@ -1,53 +1,55 @@
 #
 # TP-Link WR740N v4
 #
 # * AR9330 SoC
 # * 32MB RAM
 # * 4MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include         "AR933X_BASE"
 
 ident           TL-WR740Nv4
 
 # Override hints with board values
 hints           "TL-WR740Nv4.hints"
 
 # Board memory - 32MB
 options         AR71XX_REALMEM=(32*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
 #device		iicbb
 #device		iicbus
 #device		iic
 
 # Options required for miiproxy and mdiobus
 options 	ARGE_MDIO	# Export an MDIO bus separate from arge
 device		miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device		etherswitch
 device		arswitch
 
 # read MSDOS formatted disks - USB
 #options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
 device		geom_uncompress
 options 	GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 # options 	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 # Note: we don't fit in 4MB flash, so the rootfs must be on USB for now
 options		ROOTDEVNAME=\"ufs:da0\"
Index: head/sys/mips/conf/TP-MR3020
===================================================================
--- head/sys/mips/conf/TP-MR3020	(revision 291048)
+++ head/sys/mips/conf/TP-MR3020	(revision 291049)
@@ -1,55 +1,57 @@
 #
 # TP Link MR3020 - an AR9331 based SoC wifi device.
 #
 # This is for the 32 RAM/4 flash part. There is little to no
 # chance that this will ever boot FreeBSD directly from the 3.5MB
 # of flash.  The kernel can fit into the space, but userland is just
 # too big even when stripped down to its limits.
 #
 # * AR9331 SoC
 # * 32MB RAM
 # * 4MB flash
 # * Integrated 1x1 2GHz wifi and 10/100 bridge
 # * USB powered
 # * USB storage
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR933x parameters
 include	"AR933X_BASE"
 
 ident	TP-MR3020
 
 # Override hints with board values
 hints	"TP-MR3020.hints"
 
 # Board memory - 32MB
 options	AR71XX_REALMEM=(32*1024*1024)
 
 # Disable support for paging
 options		NO_SWAPPING
 
 # i2c GPIO bus
 device	gpioiic
 device	iicbb
 device	iicbus
 device	iic
 
 # Options required for miiproxy and mdiobus
 options	ARGE_MDIO	# Export an MDIO bus separate from arge
 device	miiproxy	# MDIO bus <-> MII PHY rendezvous
 
 device	etherswitch
 device	arswitch
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options	AR71XX_ENV_UBOOT
 
 # Used for the static uboot partition map
 device	geom_map
 
 # With only 4MB of flash, we are stuck using USB
 # for the rootfs.
 options		ROOTDEVNAME=\"ufs:da0\"
Index: head/sys/mips/conf/TP-WN1043ND
===================================================================
--- head/sys/mips/conf/TP-WN1043ND	(revision 291048)
+++ head/sys/mips/conf/TP-WN1043ND	(revision 291049)
@@ -1,59 +1,61 @@
 #
 # TP-1043ND -- Kernel configuration file for the TP-Link WR-1043ND
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 # Include the default AR913x parameters common to all AR913x SoC users.
 include         "AR91XX_BASE"
 
 ident           TP-WN1043ND
 
 # Override hints with board values
 hints           "TP-WN1043ND.hints"
 
 # Force the board memory - 32mb
 options         AR71XX_REALMEM=32*1024*1024
 
 # i2c GPIO bus
 device		gpioiic
 device		iicbb
 device		iicbus
 device		iic
 
 # ethernet switch device
 device		etherswitch
 
 # RTL8366RB support
 device		rtl8366rb
 
 # read MSDOS formatted disks - USB
 options 	MSDOSFS
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
 options 	AR71XX_ENV_UBOOT
 
 # uncompress - to boot natively from flash
 device         geom_uncompress
 options                GEOM_UNCOMPRESS
 
 # Used for the static uboot partition map
 device          geom_map
 
 # Boot off of the rootfs, as defined in the geom_map setup.
 options                ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
 
 # We bite the performance overhead for now; the kernel won't
 # fit if the mutexes are inlined.
 options        MUTEX_NOINLINE
 options        RWLOCK_NOINLINE
 options        SX_NOINLINE
 
 # Remove everything we don't need.  We need a _really_ small kernel!
 nooptions      INVARIANTS
 nooptions      INVARIANT_SUPPORT
 nooptions      WITNESS
 nooptions      WITNESS_SKIPSPIN
 nooptions      DEBUG_REDZONE
 nooptions      DEBUG_MEMGUARD
Index: head/sys/mips/conf/WZR-300HP
===================================================================
--- head/sys/mips/conf/WZR-300HP	(revision 291048)
+++ head/sys/mips/conf/WZR-300HP	(revision 291049)
@@ -1,49 +1,51 @@
 #
 # Specific board setup for the Buffalo Airstation WZR-300HP
 #
 # The WZR-300HP has the following hardware:
 #
 # + AR7242 CPU SoC
 # + AR9280 5GHz 11n
 # + AR8136 Gigabit switch
 # + 2 m25ll128 based 16MB flash
 # + 64MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR724X_BASE"
 ident		"WZR-300HP"
 hints		"WZR-300HP.hints"
 
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 options 	BOOTVERBOSE
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem hackery!
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options         ARGE_MDIO               # Export an MDIO bus separate from arge
 device          miiproxy                # MDIO bus <-> MII PHY rendezvous
 
 device          etherswitch
 device          arswitch
 
 # hwpmc
 device		hwpmc_mips24k
 device		hwpmc
 
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
 nodevice	random
Index: head/sys/mips/conf/WZR-HPAG300H
===================================================================
--- head/sys/mips/conf/WZR-HPAG300H	(revision 291048)
+++ head/sys/mips/conf/WZR-HPAG300H	(revision 291049)
@@ -1,49 +1,51 @@
 #
 # Specific board setup for the Buffalo Airstation WZR-HPAG300H
 #
 # The WZR-HPAG300H has the following hardware:
 #
 # + AR7161 CPU SoC
 # + 2x AR9280 5GHz 11n
 # + AR8136 Gigabit switch
 # + 2 m25ll128(really w25q128)  based 16MB flash
 # + 128MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"AR71XX_BASE"
 ident		"WZR-HPAG300H"
 hints		"WZR-HPAG300H.hints"
 
 options 	AR71XX_REALMEM=128*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 options 	BOOTVERBOSE
 
 # GEOM modules
 device		geom_uncompress	# compressed in-memory filesystem hackery!
 device		geom_map	# to get access to the SPI flash partitions
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options         ARGE_MDIO               # Export an MDIO bus separate from arge
 device          miiproxy                # MDIO bus <-> MII PHY rendezvous
 
 device          etherswitch
 device          arswitch
 
 # hwpmc
 device		hwpmc_mips24k
 device		hwpmc
 
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
 nodevice	random