Index: sys/amd64/conf/MMCCAM
===================================================================
--- sys/amd64/conf/MMCCAM
+++ sys/amd64/conf/MMCCAM
@@ -33,4 +33,4 @@
 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)
Index: sys/arm/conf/BEAGLEBONE-MMCCAM
===================================================================
--- sys/arm/conf/BEAGLEBONE-MMCCAM
+++ sys/arm/conf/BEAGLEBONE-MMCCAM
@@ -10,7 +10,7 @@
 
 # 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
Index: sys/arm/conf/IMX6-MMCCAM
===================================================================
--- sys/arm/conf/IMX6-MMCCAM
+++ sys/arm/conf/IMX6-MMCCAM
@@ -1,16 +1,16 @@
 #
-# BEAGLEBONE-MMCCAM
+# IMX6-MMCCAM
 #
-# Custom kernel for Beaglebone plus MMCCAM as opposed to the prior MMC stack. It is
+# 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$
 
-include		BEAGLEBONE
+include		IMX6
 
 # 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
Index: sys/arm64/conf/GENERIC-UP-MMCCAM
===================================================================
--- /dev/null
+++ sys/arm64/conf/GENERIC-UP-MMCCAM
@@ -0,0 +1,28 @@
+#
+# GENERIC -- Generic kernel configuration file for FreeBSD/arm64 with SMP disabled
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+include		GENERIC
+ident		GENERIC-UP
+nooptions 	SMP
+
+device		mmccam
+options		MMCCAM
+nodevice	mmc
+nodevice	mmcsd