git: 834517eff8aa - main - x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=834517eff8aaab46760645619b880d97f23ab61b

commit 834517eff8aaab46760645619b880d97f23ab61b
Author:     Mina Galić <freebsd@igalic.co>
AuthorDate: 2024-02-02 19:46:01 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-02 19:51:51 +0000

    x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels
    
    we leave `options CAMDEBUG` enabled, so that when needed, CAM debugging
    can be enabled *as needed*, rather than setting a default of everything.
    
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/798
---
 sys/amd64/conf/GENERIC-MMCCAM | 6 +-----
 sys/arm/conf/GENERIC-MMCCAM   | 6 +-----
 sys/arm64/conf/GENERIC-MMCCAM | 9 +++------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM
index 26e19887c800..65bada999030 100644
--- a/sys/amd64/conf/GENERIC-MMCCAM
+++ b/sys/amd64/conf/GENERIC-MMCCAM
@@ -12,12 +12,8 @@ ident		GENERIC-MMCCAM
 
 options 	MMCCAM
 
-# Add CAMDEBUG stuff
+# Allow for CAM debugging
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 
 nodevice	mmc
 nodevice	mmcsd
diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM
index 26e19887c800..65bada999030 100644
--- a/sys/arm/conf/GENERIC-MMCCAM
+++ b/sys/arm/conf/GENERIC-MMCCAM
@@ -12,12 +12,8 @@ ident		GENERIC-MMCCAM
 
 options 	MMCCAM
 
-# Add CAMDEBUG stuff
+# Allow for CAM debugging
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 
 nodevice	mmc
 nodevice	mmcsd
diff --git a/sys/arm64/conf/GENERIC-MMCCAM b/sys/arm64/conf/GENERIC-MMCCAM
index 471b299ab3c2..77d65d959763 100644
--- a/sys/arm64/conf/GENERIC-MMCCAM
+++ b/sys/arm64/conf/GENERIC-MMCCAM
@@ -10,13 +10,10 @@
 include		GENERIC
 ident		GENERIC-MMCCAM
 
-# Add CAMDEBUG stuff
-options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 options 	MMCCAM
 
+# Allow for CAM debugging
+options 	CAMDEBUG
+
 nodevice	mmc
 nodevice	mmcsd