Index: head/sys/amd64/conf/GENERIC-MMCCAM
===================================================================
--- head/sys/amd64/conf/GENERIC-MMCCAM
+++ head/sys/amd64/conf/GENERIC-MMCCAM
@@ -0,0 +1,36 @@
+# MMCCAM is the kernel config for doing MMC on CAM development
+# and testing on bhyve
+# $FreeBSD$
+
+include         MINIMAL
+
+ident		GENERIC-MMCCAM
+
+# Access GPT-formatted and labeled root volume
+options         GEOM_PART_GPT
+options         GEOM_LABEL
+
+# UART -- for bhyve console
+device          uart
+
+# kgdb stub
+device          bvmdebug
+
+# VirtIO support, needed for bhyve
+device		virtio			# Generic VirtIO bus (required)
+device		virtio_pci		# VirtIO PCI device
+device		vtnet			# VirtIO Ethernet device
+device		virtio_blk		# VirtIO Block device
+device		virtio_scsi		# VirtIO SCSI device
+device		virtio_balloon		# VirtIO Memory Balloon device
+
+# CAM-specific stuff
+device		pass
+device		scbus
+device		da
+
+options	       MMCCAM
+
+# Add CAMDEBUG stuff
+options	       CAMDEBUG
+options	       CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
Index: head/sys/amd64/conf/MMCCAM
===================================================================
--- head/sys/amd64/conf/MMCCAM
+++ head/sys/amd64/conf/MMCCAM
@@ -1,36 +0,0 @@
-# MMCCAM is the kernel config for doing MMC on CAM development
-# and testing on bhyve
-# $FreeBSD$
-
-include         MINIMAL
-
-ident		MMCCAM
-
-# Access GPT-formatted and labeled root volume
-options         GEOM_PART_GPT
-options         GEOM_LABEL
-
-# UART -- for bhyve console
-device          uart
-
-# kgdb stub
-device          bvmdebug
-
-# VirtIO support, needed for bhyve
-device		virtio			# Generic VirtIO bus (required)
-device		virtio_pci		# VirtIO PCI device
-device		vtnet			# VirtIO Ethernet device
-device		virtio_blk		# VirtIO Block device
-device		virtio_scsi		# VirtIO SCSI device
-device		virtio_balloon		# VirtIO Memory Balloon device
-
-# CAM-specific stuff
-device		pass
-device		scbus
-device		da
-device		mmccam
-
-options	MMCCAM
-# Add CAMDEBUG stuff
-options CAMDEBUG
-options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
Index: head/sys/arm/conf/BEAGLEBONE-MMCCAM
===================================================================
--- head/sys/arm/conf/BEAGLEBONE-MMCCAM
+++ head/sys/arm/conf/BEAGLEBONE-MMCCAM
@@ -6,16 +6,18 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		BEAGLEBONE
 
+options		MMCCAM
+
 # Add CAMDEBUG stuff
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
+options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
 
 # pass(4) device
 device		pass
-device		mmccam
-options		MMCCAM
 
 nodevice	mmc
 nodevice	mmcsd
Index: head/sys/arm/conf/IMX6-MMCCAM
===================================================================
--- head/sys/arm/conf/IMX6-MMCCAM
+++ head/sys/arm/conf/IMX6-MMCCAM
@@ -0,0 +1,23 @@
+#
+# IMX6-MMCCAM
+#
+# Custom kernel for IMX6 plus MMCCAM as opposed to the prior MMC stack. It is
+# present to keep it building in tree since it wouldn't work in LINT.
+#
+# $FreeBSD$
+
+#NO_UNIVERSE
+
+include		IMX6
+
+options		MMCCAM
+
+# Add CAMDEBUG stuff
+options 	CAMDEBUG
+options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
+
+# pass(4) device
+device		pass
+
+nodevice	mmc
+nodevice	mmcsd