Index: head/sys/mips/conf/BERI_DE4_BASE
===================================================================
--- head/sys/mips/conf/BERI_DE4_BASE	(revision 314179)
+++ head/sys/mips/conf/BERI_DE4_BASE	(revision 314180)
@@ -1,52 +1,52 @@
 #
 # BERI_DE4_BASE -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
 # Implementation) FPGA soft core, as configured in its Terasic DE-4 reference
 # configuration.  This kernel configration must be further specialized to
 # to include a root filesystem specification.
 #
 # $FreeBSD$
 #
 
-include "std.BERI"
+#NO_UNIVERSE
 
-ident		BERI_DE4_BASE
+include "std.BERI"
 
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 
 options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=beripad-de4.dts
 
 hints		"BERI_DE4.hints"	# Flash partitions still use hints.
 
 device		altera_atse
 device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
 device		terasic_de4led
 device		terasic_mtl
 
 device		bpf
 device		cfi
 device		cfid
 options 	CFI_SUPPORT_STRATAFLASH
 options 	ATSE_CFI_HACK
 device		vt
 device		kbdmux
 
 device		uart
 
 device		miibus
 options 	DEVICE_POLLING
 
 #
 # USB support
 #
 #options	USB_DEBUG
 #options	USB_REQ_DEBUG
 #options	USB_VERBOSE
 device		usb
 device		saf1761otg
 
Index: head/sys/mips/conf/BERI_DE4_SDROOT
===================================================================
--- head/sys/mips/conf/BERI_DE4_SDROOT	(revision 314179)
+++ head/sys/mips/conf/BERI_DE4_SDROOT	(revision 314180)
@@ -1,18 +1,16 @@
 #
 # 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_BASE
===================================================================
--- head/sys/mips/conf/BERI_SIM_BASE	(revision 314179)
+++ head/sys/mips/conf/BERI_SIM_BASE	(revision 314180)
@@ -1,19 +1,21 @@
 #
 # BERI_SIM_BASE -- Base kernel for the SRI/Cambridge "BERI" (Bluespec
 # Extensible RISC Implementation) FPGA soft core, as configured for
 # simulation.
 #
 # $FreeBSD$
 #
 
+#NO_UNIVERSE
+
 include "std.BERI"
 
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beri-sim.dts
 
 options 	ALTERA_SDCARD_FAST_SIM
 
 device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard