git: 6eebda3bbad9 - main - Split out the NODEBUG options to a common file

[Andrew Turner]

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=6eebda3bbad96ab6ef001781ee1b6de45af062a2

commit 6eebda3bbad96ab6ef001781ee1b6de45af062a2
Author:     Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2021-01-14 10:54:18 +0000
Commit:     Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2021-01-14 16:57:53 +0000

    Split out the NODEBUG options to a common file
    
    This is the superset of the nooptions found in the -DEBUG kernels.
    
    Reviewed by:    emaste, manu
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D28152
---
 sys/amd64/conf/GENERIC-NODEBUG   | 13 +------------
 sys/arm/conf/GENERIC-NODEBUG     |  8 +-------
 sys/arm64/conf/GENERIC-NODEBUG   | 12 +-----------
 sys/conf/std.nodebug             | 23 +++++++++++++++++++++++
 sys/i386/conf/GENERIC-NODEBUG    |  8 +-------
 sys/powerpc/conf/GENERIC-NODEBUG |  8 +-------
 sys/riscv/conf/GENERIC-NODEBUG   | 12 +-----------
 7 files changed, 29 insertions(+), 55 deletions(-)

diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
index 1f17382b3214..332cf85eb372 100644
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -27,17 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
-nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES
-nooptions	QUEUE_MACRO_DEBUG_TRASH
diff --git a/sys/arm/conf/GENERIC-NODEBUG b/sys/arm/conf/GENERIC-NODEBUG
index ab5eb00d4fc9..6e60deff7569 100644
--- a/sys/arm/conf/GENERIC-NODEBUG
+++ b/sys/arm/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/sys/arm64/conf/GENERIC-NODEBUG b/sys/arm64/conf/GENERIC-NODEBUG
index 7d23884ef90b..8b99852be971 100644
--- a/sys/arm64/conf/GENERIC-NODEBUG
+++ b/sys/arm64/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions       USB_DEBUG
-nooptions       HID_DEBUG
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug
new file mode 100644
index 000000000000..53a7fc6b2f81
--- /dev/null
+++ b/sys/conf/std.nodebug
@@ -0,0 +1,23 @@
+#
+# std.nodebug -- Disable the debug options found in the GENERIC kernel config.
+#
+
+nooptions	INVARIANTS
+nooptions	INVARIANT_SUPPORT
+nooptions	WITNESS
+nooptions	WITNESS_SKIPSPIN
+nooptions	BUF_TRACKING
+nooptions	FULL_BUF_TRACKING
+nooptions	DEADLKRES
+nooptions	COVERAGE
+nooptions	KCOV
+nooptions	MALLOC_DEBUG_MAXZONES
+nooptions	QUEUE_MACRO_DEBUG_TRASH
+
+# USB debugging
+nooptions	USB_DEBUG
+nooptions	HID_DEBUG
+
+# CAM debugging
+nooptions	CAMDEBUG
+nooptions	CAM_DEBUG_FLAGS
diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
index be20edf1763c..d09663e1b9db 100644
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
index 983219e0b02a..b86116253d78 100644
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/sys/riscv/conf/GENERIC-NODEBUG b/sys/riscv/conf/GENERIC-NODEBUG
index 644ce0d4e0c6..9b1d9fe5a9af 100644
--- a/sys/riscv/conf/GENERIC-NODEBUG
+++ b/sys/riscv/conf/GENERIC-NODEBUG
@@ -27,16 +27,6 @@
 # $FreeBSD$
 
 include GENERIC
+include "../../conf/std.nodebug"
 
 ident   GENERIC-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
-nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
-nooptions	COVERAGE
-nooptions	KCOV
-nooptions	MALLOC_DEBUG_MAXZONES