diff --git a/sys/mips/conf/CANNA b/sys/mips/conf/CANNA
index 0d6f81b52c30..b5117f8beda9 100644
--- a/sys/mips/conf/CANNA
+++ b/sys/mips/conf/CANNA
@@ -1,29 +1,30 @@
 # CANNA -- Kernel config for Ingenic CANNA board
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"X1000"
 ident		CANNA
 
-options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=ingenic/canna.dts
 
 #options 	KTR
 #options 	KTR_CPUMASK=0x3
 #options 	KTR_MASK=(KTR_GEN)
 #options 	KTR_COMPILE=(KTR_GEN)
 #options 	KTR_VERBOSE
 
 # Uncomment for NFS root
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=dme0
 #options 	BOOTP_COMPAT
 options 	ROOTDEVNAME=\"ufs:mmcsd0s3\"
 
 makeoptions	TRAMPLOADADDR=0x88000000
 
 #options 	VERBOSE_SYSINIT
 options 	PRINTF_BUFR_SIZE=256
diff --git a/sys/mips/conf/CI20 b/sys/mips/conf/CI20
index 9d1940d85e85..fef340c15d7a 100644
--- a/sys/mips/conf/CI20
+++ b/sys/mips/conf/CI20
@@ -1,31 +1,31 @@
 # CI20 -- Kernel config for Creator CI20 board
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"JZ4780"
 ident		CI20
 
-options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=ingenic/ci20.dts
 
 #options 	KTR
 #options 	KTR_CPUMASK=0x3
 #options 	KTR_MASK=(KTR_GEN)
 #options 	KTR_COMPILE=(KTR_GEN)
 #options 	KTR_VERBOSE
 
 # Uncomment for NFS root
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=dme0
 #options 	BOOTP_COMPAT
 
 options 	ROOTDEVNAME=\"ufs:mmcsd0\"
 
 makeoptions	TRAMPLOADADDR=0x88000000
 
 #options 	VERBOSE_SYSINIT
-device		dme
 options 	PRINTF_BUFR_SIZE=256
diff --git a/sys/mips/conf/JZ4780 b/sys/mips/conf/JZ4780
index 2b7335af2269..53986b2b9bab 100644
--- a/sys/mips/conf/JZ4780
+++ b/sys/mips/conf/JZ4780
@@ -1,92 +1,97 @@
 # JZ4780 -- Kernel config for Ingenic JZ47XX boards
 #
 # $FreeBSD$
 
 ident		JZ4780
 machine		mips mipsel
 cpu		CPU_XBURST
 cpu		CPU_MIPS4KC
 
 makeoptions	KERNLOADADDR=0x80020000
 makeoptions	ARCH_FLAGS="-EL -march=mips32r2"
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
 files		"../ingenic/files.jz4780"
 hints		"JZ4780.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	INTRNG			# Borrow interrupt code from ARM
 options 	MIPS_NIRQ=264		# 8 cpuintc + 64 intc + 6 * 23 gpio
 
 options 	DDB
 options 	KDB
 options 	BREAK_TO_DEBUGGER
 
 options 	COMPAT_FREEBSD10
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	NFSCL			#Network Filesystem Client
 options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	NFSLOCKD		#Network Lock Manager
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	ROOTDEVNAME=\"ufs:ada0\"
 
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_RAID		# Soft RAID functionality.
 
 # Debugging for use in -current
 #options 	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 
 device		loop
 device		ether
 #device		le
 device		miibus
 device		bpf
 device		md
 device		uart
 device		random
 
 device		fdt_pinctrl
 
 device		clk
 device		regulator
 device		ext_resources
 
 device		gpio
 
 device 		scbus
 device 		da
 
 device		mmc
 device		mmcsd
 
+device		dme
+
 # USB support
 options 	USB_DEBUG	# enable debug msgs
 options 	USB_HOST_ALIGN=128 # L2 cache line size
 device		ohci		# OHCI PCI->USB interface
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		dwcotg		# DesignWare HS OTG controller
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
 device		uhid		# "Human Interface Devices"
 #device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
+
+# FDT support
+options 	FDT
diff --git a/sys/mips/conf/X1000 b/sys/mips/conf/X1000
index 8659f1112e4b..035a540f73cc 100644
--- a/sys/mips/conf/X1000
+++ b/sys/mips/conf/X1000
@@ -1,89 +1,92 @@
 # X1000 -- Kernel config for Ingenic X1000 boards
 #
 # $FreeBSD$
 
 ident		X1000
 machine		mips mipsel
 cpu		CPU_XBURST
 cpu		CPU_MIPS4KC
 
 makeoptions	KERNLOADADDR=0x80020000
 makeoptions	ARCH_FLAGS="-EL -march=mips32r2"
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
 files		"../ingenic/files.x1000"
 hints		"X1000.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	INTRNG			# Borrow interrupt code from ARM
 options 	MIPS_NIRQ=264		# 8 cpuintc + 64 intc + 6 * 23 gpio
 
 options 	DDB
 options 	KDB
 options 	BREAK_TO_DEBUGGER
 
 options 	COMPAT_FREEBSD10
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	NFSCL			#Network Filesystem Client
 options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	NFSLOCKD		#Network Lock Manager
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	ROOTDEVNAME=\"ufs:ada0\"
 
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_RAID		# Soft RAID functionality.
 
 # Debugging for use in -current
 #options 	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
 device		loop
 device		ether
 #device		le
 device		miibus
 device		bpf
 device		md
 device		uart
 device		random
 
 device		fdt_pinctrl
 
 device		clk
 device		regulator
 device		ext_resources
 
 device		gpio
 
 device 		scbus
 device 		da
 
 device		mmc
 device		mmcsd
 
 # USB support
 #options 	USB_DEBUG	# enable debug msgs
 #options 	USB_HOST_ALIGN=128 # L2 cache line size
 #device		ohci		# OHCI PCI->USB interface
 #device		ehci		# EHCI PCI->USB interface (USB 2.0)
 #device		dwcotg		# DesignWare HS OTG controller
 #device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
 #device		uhid		# "Human Interface Devices"
 #device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
 #device		ums		# Mouse
+
+# FDT support
+options 	FDT