diff --git a/sys/amd64/conf/MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM
similarity index 82%
rename from sys/amd64/conf/MMCCAM
rename to sys/amd64/conf/GENERIC-MMCCAM
index c8bbeb817f5c..09343ade072a 100644
--- a/sys/amd64/conf/MMCCAM
+++ b/sys/amd64/conf/GENERIC-MMCCAM
@@ -4,7 +4,7 @@
 
 include         MINIMAL
 
-ident		MMCCAM
+ident		GENERIC-MMCCAM
 
 # Access GPT-formatted and labeled root volume
 options         GEOM_PART_GPT
@@ -28,9 +28,9 @@ device		virtio_balloon		# VirtIO Memory Balloon device
 device		pass
 device		scbus
 device		da
-device		mmccam
 
-options	MMCCAM
+options	       MMCCAM
+
 # Add CAMDEBUG stuff
-options CAMDEBUG
-options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
+options	       CAMDEBUG
+options	       CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
diff --git a/sys/arm/conf/BEAGLEBONE-MMCCAM b/sys/arm/conf/BEAGLEBONE-MMCCAM
index 3d83352e79c0..d498512bd84f 100644
--- a/sys/arm/conf/BEAGLEBONE-MMCCAM
+++ b/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
diff --git a/sys/arm/conf/IMX6-MMCCAM b/sys/arm/conf/IMX6-MMCCAM
new file mode 100644
index 000000000000..c76d9dc700f0
--- /dev/null
+++ b/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