diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9fc2e5e9e29..b067a8c1398 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -802,7 +802,7 @@
Definitions in the Make.defs file probably depend on some of the
settings in the .config file. For example, the CFLAGS will most likely be
- different if CONFIG_DEBUG=y.
+ different if CONFIG_DEBUG_FEATURES=y.
The included tools/Config.mk file contains additional definitions that may
diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index 03530cbfb67..a6800983d5b 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -125,7 +125,7 @@
CONFIG_USBDEV_TRACE, orCONFIG_DEBUG and CONFIG_DEBUG_USBCONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB
Log Data Sink.
The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
@@ -137,7 +137,7 @@
Here is an example of USB trace output using apps/examples/usbserial for an LPC1768 platform with the following NuttX configuration settings:
- CONFIG_DEBUG, CONFIG_DEBUG_INFO, CONFIG_USB
+ CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, CONFIG_USB
CONFIG_EXAMPLES_USBSERIAL_TRACEINIT, CONFIG_EXAMPLES_USBSERIAL_TRACECLASS,
CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS, CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER,
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS
diff --git a/Kconfig b/Kconfig
index b0afa42a9ca..12e8887d3b6 100644
--- a/Kconfig
+++ b/Kconfig
@@ -395,7 +395,7 @@ endmenu # Customize Header Files
menu "Debug Options"
-config DEBUG
+config DEBUG_FEATURES
bool "Enable Debug Features"
default n
---help---
@@ -409,7 +409,7 @@ config ARCH_HAVE_HEAPCHECK
bool
default n
-if DEBUG
+if DEBUG_FEATURES
comment "Debug SYSLOG Output Controls"
@@ -707,7 +707,7 @@ config DEBUG_WATCHDOG
Support for this debug option is architecture-specific and may not
be available for some MCUs.
-endif # DEBUG
+endif # DEBUG_FEATURES
config ARCH_HAVE_STACKCHECK
bool
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6b6c046060d..f31f8127783 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -588,7 +588,7 @@ config ARCH_ROMPGTABLE
config DEBUG_HARDFAULT
bool "Verbose Hard-Fault Debug"
default n
- depends on DEBUG && (ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7)
+ depends on DEBUG_FEATURES && (ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7)
---help---
Enables verbose debug output when a hard fault is occurs. This verbose
output is sometimes helpful when debugging difficult hard fault problems,
diff --git a/arch/arm/include/efm32/irq.h b/arch/arm/include/efm32/irq.h
index 7bd0449d621..a5f2eff8e47 100644
--- a/arch/arm/include/efm32/irq.h
+++ b/arch/arm/include/efm32/irq.h
@@ -60,7 +60,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define EFM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define EFM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define EFM32_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/kinetis/irq.h b/arch/arm/include/kinetis/irq.h
index 3355f29b02c..16b59ab8ae9 100644
--- a/arch/arm/include/kinetis/irq.h
+++ b/arch/arm/include/kinetis/irq.h
@@ -58,7 +58,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define KINETIS_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define KINETIS_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define KINETIS_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/kl/irq.h b/arch/arm/include/kl/irq.h
index 27ba8575f52..93021827300 100644
--- a/arch/arm/include/kl/irq.h
+++ b/arch/arm/include/kl/irq.h
@@ -58,7 +58,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define KL_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define KL_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define KL_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc11xx/irq.h b/arch/arm/include/lpc11xx/irq.h
index caac7c3e170..46ff7d27cac 100644
--- a/arch/arm/include/lpc11xx/irq.h
+++ b/arch/arm/include/lpc11xx/irq.h
@@ -59,7 +59,7 @@
/* Common Processor Exceptions (vectors 0-15) */
-#define LPC11_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC11_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define LPC11_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc17xx/irq.h b/arch/arm/include/lpc17xx/irq.h
index 6af683225ca..99bffe17ebb 100644
--- a/arch/arm/include/lpc17xx/irq.h
+++ b/arch/arm/include/lpc17xx/irq.h
@@ -59,7 +59,7 @@
/* Common Processor Exceptions (vectors 0-15) */
-#define LPC17_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC17_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define LPC17_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc43xx/irq.h b/arch/arm/include/lpc43xx/irq.h
index 9b103e97185..dd9790ab107 100644
--- a/arch/arm/include/lpc43xx/irq.h
+++ b/arch/arm/include/lpc43xx/irq.h
@@ -59,7 +59,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define LPC43_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC43_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define LPC43_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/nuc1xx/irq.h b/arch/arm/include/nuc1xx/irq.h
index 0db0379d1b4..26b0d8125f5 100644
--- a/arch/arm/include/nuc1xx/irq.h
+++ b/arch/arm/include/nuc1xx/irq.h
@@ -58,7 +58,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define NUC_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define NUC_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define NUC_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/sam34/irq.h b/arch/arm/include/sam34/irq.h
index 521cd5a93cd..a0f5de604f7 100644
--- a/arch/arm/include/sam34/irq.h
+++ b/arch/arm/include/sam34/irq.h
@@ -58,7 +58,7 @@
/* Common Processor Exceptions (vectors 0-15) */
-#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define SAM_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/samdl/irq.h b/arch/arm/include/samdl/irq.h
index d74584fb298..7da8c7b21e6 100644
--- a/arch/arm/include/samdl/irq.h
+++ b/arch/arm/include/samdl/irq.h
@@ -58,7 +58,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define SAM_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/samv7/irq.h b/arch/arm/include/samv7/irq.h
index 4c33f3dbec0..eec3d12e054 100644
--- a/arch/arm/include/samv7/irq.h
+++ b/arch/arm/include/samv7/irq.h
@@ -58,7 +58,7 @@
/* Common Processor Exceptions (vectors 0-15) */
-#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define SAM_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32/irq.h b/arch/arm/include/stm32/irq.h
index 1d57bc3e500..2c9b188f025 100644
--- a/arch/arm/include/stm32/irq.h
+++ b/arch/arm/include/stm32/irq.h
@@ -59,7 +59,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define STM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define STM32_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32f7/irq.h b/arch/arm/include/stm32f7/irq.h
index 205d06b6440..f09659190b7 100644
--- a/arch/arm/include/stm32f7/irq.h
+++ b/arch/arm/include/stm32f7/irq.h
@@ -57,7 +57,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define STM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define STM32_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32l4/irq.h b/arch/arm/include/stm32l4/irq.h
index ebfb2266789..89e74c1760b 100644
--- a/arch/arm/include/stm32l4/irq.h
+++ b/arch/arm/include/stm32l4/irq.h
@@ -57,7 +57,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define STM32L4_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32L4_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define STM32L4_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/tiva/irq.h b/arch/arm/include/tiva/irq.h
index 17c73a254de..d6a3216da96 100644
--- a/arch/arm/include/tiva/irq.h
+++ b/arch/arm/include/tiva/irq.h
@@ -162,7 +162,7 @@
/* Processor Exceptions (vectors 0-15) */
-#define TIVA_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define TIVA_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
/* Vector 0: Reset stack pointer value */
/* Vector 1: Reset (not handler as an IRQ) */
#define TIVA_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index e8e6b8dbb94..5e2aa0810d4 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -81,12 +81,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 676928c7cdf..2306d807136 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index 53f94a2e0fa..da317c12f97 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/up_head.S
@@ -208,7 +208,7 @@
/* This macro will modify r0, r1, r2 and r14 */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.macro showprogress, code
mov r0, #\code
bl up_lowputc
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S
index 04c5205efe0..d8689d85bd6 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/arch/arm/src/arm/up_nommuhead.S
@@ -49,7 +49,7 @@
/* This macro will modify r0, r1, r2 and r14 */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.macro showprogress, code
mov r0, #\code
bl up_lowputc
@@ -115,7 +115,7 @@ __start:
bl up_earlyserialinit
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov r0, #'C'
bl up_putc
mov r0, #'\n'
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index c827a38868a..995fedd1bed 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c
index 6c8ba18e449..498f702281f 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/arch/arm/src/arm/up_syscall.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c
index 468d55e6af6..4c242126bbb 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/arch/arm/src/arm/up_undefinedinsn.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv6-m/nvic.h b/arch/arm/src/armv6-m/nvic.h
index 945d5c4338f..06d11d5d634 100644
--- a/arch/arm/src/armv6-m/nvic.h
+++ b/arch/arm/src/armv6-m/nvic.h
@@ -386,7 +386,7 @@ extern "C"
*
****************************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
void up_dumpnvic(FAR const char *msg);
#else
# define up_dumpnvic(m)
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 8106eaf10e3..4c391ed8481 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,13 +79,13 @@
/* The following is just intended to keep some ugliness out of the mainline
* code. We are going to print the task name if:
*
- * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
- * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
+ * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c
index 36c2fdf2168..3e67f443729 100644
--- a/arch/arm/src/armv6-m/up_dumpnvic.c
+++ b/arch/arm/src/armv6-m/up_dumpnvic.c
@@ -48,7 +48,7 @@
#include "nvic.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Private Data
@@ -108,4 +108,4 @@ void up_dumpnvic(FAR const char *msg)
leave_critical_section(flags);
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index b5cec079379..45610c5cc09 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -64,8 +64,8 @@
/* Debug output from this file may interfere with context switching! To get
* debug output you must enabled the following in your NuttX configuration:
*
- * - CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL (shows only syscalls)
- * - CONFIG_DEBUG and CONFIG_DEBUG_SVCALL (shows everything)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL (shows only syscalls)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SVCALL (shows everything)
*/
#if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 6299a462416..83191f510d4 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,12 +79,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 52c6bb2f98f..927ace3360e 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 220026da340..c98ab30719d 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -169,7 +169,7 @@
/* This macro will modify r0, r1, r2 and r14 */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.macro showprogress, code
mov r0, #\code
bl up_lowputc
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index bc4c99ce26d..1a546c813d4 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -194,7 +194,7 @@
/* This macro will modify r0, r1, r2 and r14 */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.macro showprogress, code
mov r0, #\code
bl up_lowputc
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index f06150772bd..18f37557fb9 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 10e0569d1f7..fbaf5f5e18a 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 208ca5068c0..5b93bbd6cd3 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 310c21a9091..8ca9a0293c7 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -219,7 +219,7 @@ uint32_t mpu_subregion(uintptr_t base, size_t size, uint8_t l2size);
static inline void mpu_showtype(void)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t regval = getreg32(MPU_TYPE);
dbg("%s MPU Regions: data=%d instr=%d\n",
(regval & MPU_TYPE_SEPARATE) != 0 ? "Separate" : "Unified",
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index 70fdfcd95da..e7546d3d238 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,12 +79,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index 4d28224fd7e..eb9f41b74fe 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -65,8 +65,8 @@
/* Debug output from this file may interfere with context switching! To get
* debug output you must enabled the following in your NuttX configuration:
*
- * - CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL (shows only syscalls)
- * - CONFIG_DEBUG and CONFIG_DEBUG_SVCALL (shows everything)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL (shows only syscalls)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SVCALL (shows everything)
*/
#if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index a7082e91731..8ec701d9adf 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -78,13 +78,13 @@
/* The following is just intended to keep some ugliness out of the mainline
* code. We are going to print the task name if:
*
- * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
- * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
+ * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index 9366c5d1c2d..cf2d73d4388 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index e6e4607b0da..ab7228eac24 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 401835a556c..c68ba0f798e 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index f9716239c34..5ecee39ce8d 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 67aeb2e94a2..26d5f9373d0 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -359,7 +359,7 @@ static inline void mpu_set_rgnr(unsigned int rgnr)
static inline void mpu_showtype(void)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t regval = mpu_get_mpuir();
dbg("%s MPU Regions: data=%d instr=%d\n",
(regval & MPUIR_SEPARATE) != 0 ? "Separate" : "Unified",
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 3497ded776e..0fc1cf11761 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -413,7 +413,7 @@ static void c5471_macassign(struct c5471_driver_s *c5471);
#ifdef CONFIG_C5471_NET_DUMPBUFFER
static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer, unsigned int nbytes)
{
- /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
+ /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
* defined or the following does nothing.
*/
diff --git a/arch/arm/src/common/up_createstack.c b/arch/arm/src/common/up_createstack.c
index c3aa9d7adb9..1aa06a31c36 100644
--- a/arch/arm/src/common/up_createstack.c
+++ b/arch/arm/src/common/up_createstack.c
@@ -205,7 +205,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
}
#endif /* CONFIG_TLS */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 57137a60def..1a41f52ad47 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -66,7 +66,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -140,7 +140,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 511138e4f51..da8db2d0b00 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -72,7 +72,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index b6c6def0d54..b753adc2746 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -980,7 +980,7 @@ static void dm320_hwinitialize(void)
static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable,
FAR struct fb_videoinfo_s *vinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !vinfo)
{
return -EINVAL;
@@ -1003,7 +1003,7 @@ static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable,
static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
FAR struct fb_planeinfo_s *pinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !pinfo)
{
return -EINVAL;
@@ -1027,7 +1027,7 @@ static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable,
FAR struct fb_videoinfo_s *vinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !vinfo)
{
return -EINVAL;
@@ -1050,7 +1050,7 @@ static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable,
static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
FAR struct fb_planeinfo_s *pinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !pinfo)
{
return -EINVAL;
@@ -1074,7 +1074,7 @@ static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable,
FAR struct fb_videoinfo_s *vinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !vinfo)
{
return -EINVAL;
@@ -1101,7 +1101,7 @@ static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable,
static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
FAR struct fb_planeinfo_s *pinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !pinfo)
{
return -EINVAL;
@@ -1125,7 +1125,7 @@ static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable,
FAR struct fb_videoinfo_s *vinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !vinfo)
{
return -EINVAL;
@@ -1152,7 +1152,7 @@ static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable,
static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
FAR struct fb_planeinfo_s *pinfo)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !pinfo)
{
return -EINVAL;
@@ -1196,7 +1196,7 @@ static int dm320_putcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *c
int len
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !cmap || !cmap->read || !cmap->green || !cmap->blue)
{
return -EINVAL;
@@ -1245,7 +1245,7 @@ static int dm320_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursora
{
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !attrib)
{
return -EINVAL;
@@ -1288,7 +1288,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs
irqstate_t flags;
uint16_t regval;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!vtable || !settings)
{
return -EINVAL;
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index aae0d5fe3cd..ed3812c6980 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -268,7 +268,7 @@ struct dm320_epinfo_s
/* Register operations */
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t dm320_getreg8(uint32_t addr);
static uint32_t dm320_getreg16(uint32_t addr);
static uint32_t dm320_getreg32(uint32_t addr);
@@ -422,7 +422,7 @@ static const struct dm320_epinfo_s g_epinfo[DM320_NENDPOINTS] =
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint8_t dm320_getreg8(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -485,7 +485,7 @@ static uint8_t dm320_getreg8(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t dm320_getreg16(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -548,7 +548,7 @@ static uint32_t dm320_getreg16(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t dm320_getreg32(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -611,7 +611,7 @@ static uint32_t dm320_getreg32(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void dm320_putreg8(uint8_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -632,7 +632,7 @@ static void dm320_putreg8(uint8_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void dm320_putreg16(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -653,7 +653,7 @@ static void dm320_putreg16(uint16_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void dm320_putreg32(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -1943,7 +1943,7 @@ static int dm320_epdisable(FAR struct usbdev_ep_s *ep)
FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -1974,7 +1974,7 @@ static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct dm320_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
return NULL;
@@ -2005,7 +2005,7 @@ static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct dm320_req_s *privreq = (FAR struct dm320_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2075,7 +2075,7 @@ static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2170,7 +2170,7 @@ static int dm320_epcancel(struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
FAR struct dm320_usbdev_s *priv;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2293,7 +2293,7 @@ static int dm320_getframe(struct usbdev_s *dev)
usbtrace(TRACE_DEVGETFRAME, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2345,7 +2345,7 @@ static int dm320_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2544,7 +2544,7 @@ int usbdev_register(FAR struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || (driver->speed != USB_SPEED_FULL) || !driver->ops->bind ||
!driver->ops->unbind || !driver->ops->setup)
{
@@ -2602,7 +2602,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/efm32/Kconfig b/arch/arm/src/efm32/Kconfig
index ad1abfbfa06..877cca10740 100644
--- a/arch/arm/src/efm32/Kconfig
+++ b/arch/arm/src/efm32/Kconfig
@@ -140,7 +140,7 @@ config EFM32_FLASHPROG
config EFM32_RMU_DEBUG
bool "Reset Management Unit (RMU) DEBUG "
default n
- depends on EFM32_RMU && DEBUG
+ depends on EFM32_RMU && DEBUG_FEATURES
config EFM32_I2C0
bool "I2C0"
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index e2f0d3b5df7..d5974078118 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -450,7 +450,7 @@ static inline uint32_t efm32_hfclk_config(uint32_t hfclksel, uint32_t hfclkdiv)
}
break;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
default:
PANIC();
#endif
diff --git a/arch/arm/src/efm32/efm32_gpio.h b/arch/arm/src/efm32/efm32_gpio.h
index ed54bb5148c..50c239954aa 100644
--- a/arch/arm/src/efm32/efm32_gpio.h
+++ b/arch/arm/src/efm32/efm32_gpio.h
@@ -50,7 +50,7 @@
************************************************************************************/
/* Configuration ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index de775d4dd4d..aef2df814e5 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -134,7 +134,7 @@
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 821d5cdc76d..078ec8e8a40 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -164,7 +164,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int efm32_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -448,7 +448,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(EFM32_IRQ_NMI, efm32_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(EFM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index e57af783531..4e0fc0f37dd 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -119,7 +119,7 @@
#define EFM32_TXERR_INTS (LEUART_IEN_TXOF)
#define EFM32_RXERR_INTS (LEUART_IEN_RXOF | LEUART_IEN_PERR | \
LEUART_IEN_FERR)
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define EFM32_TX_INTS (LEUART_IEN_TXBL | EFM32_TXERR_INTS)
# define EFM32_RX_INTS (LEUART_IEN_RXDATAV | EFM32_RXERR_INTS)
#else
@@ -506,7 +506,7 @@ static int efm32_interrupt(struct uart_dev_s *dev)
uart_xmitchars(dev);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check for receive errors */
if ((intflags & EFM32_RXERR_INTS) != 0)
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index d0db8e6bdee..3f848de28a2 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -77,7 +77,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index 9d4dfb514e5..0d108d48114 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -50,7 +50,7 @@
****************************************************************************/
/* Configuration ************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_EFM32_RMU_DEBUG
#endif
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index 914ebd03ff3..1bc1c9f107f 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -130,7 +130,7 @@
#define __CNT_CARRY_REG EFM32_BURTC_RET_REG(0)
#define __CNT_ZERO_REG EFM32_BURTC_RET_REG(1)
-#if defined CONFIG_DEBUG && defined CONFIG_RTC_DEBUG
+#if defined CONFIG_DEBUG_FEATURES && defined CONFIG_RTC_DEBUG
# define burtcdbg lldbg
#else
# define burtcdbg(x...)
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index fed33adcba2..c0f3bd4a5f7 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -205,7 +205,7 @@
#define EFM32_TXERR_INTS (USART_IEN_TXOF)
#define EFM32_RXERR_INTS (USART_IEN_RXOF | USART_IEN_RXUF | \
USART_IEN_PERR | USART_IEN_FERR)
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define EFM32_TX_INTS (USART_IEN_TXBL | EFM32_TXERR_INTS)
# define EFM32_RX_INTS (USART_IEN_RXDATAV | EFM32_RXERR_INTS)
#else
@@ -768,7 +768,7 @@ static int efm32_rxinterrupt(struct uart_dev_s *dev)
uart_recvchars(dev);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check for receive errors */
if ((intflags & EFM32_RXERR_INTS) != 0)
@@ -856,7 +856,7 @@ static int efm32_txinterrupt(struct uart_dev_s *dev)
uart_xmitchars(dev);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check for transmit errors */
if ((intflags & EFM32_TXERR_INTS) != 0)
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 7c48070e4af..321de58d7d1 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -94,7 +94,7 @@
/* Debug ********************************************************************/
/* Check if SPI debug is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c
index ec0171f2307..f62e1461d51 100644
--- a/arch/arm/src/efm32/efm32_start.c
+++ b/arch/arm/src/efm32/efm32_start.c
@@ -85,7 +85,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# if defined(CONFIG_ARMV7M_ITMSYSLOG)
# define showprogress(c) (void)syslog_putc(c)
# elif defined(HAVE_UART_CONSOLE) || defined(HAVE_LEUART_CONSOLE)
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index 3e75e631ea2..b526376c876 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -63,7 +63,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing TIMER */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_TIMER
#endif
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index bffcadbf93e..fab48672073 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -474,7 +474,7 @@ struct efm32_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t efm32_getreg(uint32_t addr);
static void efm32_putreg(uint32_t val, uint32_t addr);
#else
@@ -794,7 +794,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
*
****************************************************************************/
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t efm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -857,7 +857,7 @@ static uint32_t efm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void efm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -4184,7 +4184,7 @@ static int efm32_ep_disable(FAR struct usbdev_ep_s *ep)
{
FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4224,7 +4224,7 @@ static FAR struct usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct efm32_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4257,7 +4257,7 @@ static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct efm32_req_s *privreq = (FAR struct efm32_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4329,7 +4329,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
/* Some sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4341,7 +4341,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
usbtrace(TRACE_EPSUBMIT, privep->epphy);
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4418,7 +4418,7 @@ static int efm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4876,7 +4876,7 @@ static int efm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -5605,7 +5605,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -5676,7 +5676,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 9f4c926cbee..0c3c12fbc7f 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -92,9 +92,9 @@
* CONFIG_EFM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
* want to do that?
* CONFIG_EFM32_USBHOST_REGDEBUG - Enable very low-level register access
- * debug. Depends on CONFIG_DEBUG.
+ * debug. Depends on CONFIG_DEBUG_FEATURES.
* CONFIG_EFM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- * packets. Depends on CONFIG_DEBUG.
+ * packets. Depends on CONFIG_DEBUG_FEATURES.
*/
/* Default RxFIFO size */
@@ -121,9 +121,9 @@
# define CONFIG_EFM32_OTGFS_DESCSIZE 128
#endif
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_EFM32_USBHOST_REGDEBUG
# undef CONFIG_EFM32_USBHOST_PKTDUMP
#endif
diff --git a/arch/arm/src/imx6/imx_lowputc.c b/arch/arm/src/imx6/imx_lowputc.c
index a6387e73216..8bfabf70856 100644
--- a/arch/arm/src/imx6/imx_lowputc.c
+++ b/arch/arm/src/imx6/imx_lowputc.c
@@ -584,7 +584,7 @@ int imx_uart_configure(uint32_t base, FAR const struct uart_config_s *config)
*
************************************************************************************/
-#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG)
+#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG_FEATURES)
void imx_lowputc(int ch)
{
/* Poll the TX fifo trigger level bit of the UART status register. When the TXFE
diff --git a/arch/arm/src/imx6/imx_lowputc.h b/arch/arm/src/imx6/imx_lowputc.h
index d487931dc63..081f366ea7c 100644
--- a/arch/arm/src/imx6/imx_lowputc.h
+++ b/arch/arm/src/imx6/imx_lowputc.h
@@ -105,7 +105,7 @@ int imx_uart_configure(uint32_t base, FAR const struct uart_config_s *config);
*
************************************************************************************/
-#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG)
+#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG_FEATURES)
void imx_lowputc(int ch);
#else
# define imx_lowputc(ch)
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 44f21af47d6..6fea2521010 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -168,7 +168,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int kinetis_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -420,7 +420,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(KINETIS_IRQ_NMI, kinetis_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 6d8f2235911..51604dd8602 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -78,7 +78,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index d385592b409..38607d128b4 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -2152,7 +2152,7 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2209,7 +2209,7 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t r
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2263,7 +2263,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
/* Check that this is the correct response to this command */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
{
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 550ff55917d..1d5e6d48403 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -232,7 +232,7 @@ struct up_dev_s
uintptr_t uartbase; /* Base address of UART registers */
uint32_t baud; /* Configured baud */
uint32_t clock; /* Clocking frequency of the UART module */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint8_t irqe; /* Error IRQ associated with this UART (for enable) */
#endif
uint8_t irqs; /* Status IRQ associated with this UART (for enable) */
@@ -250,7 +250,7 @@ static int up_setup(struct uart_dev_s *dev);
static void up_shutdown(struct uart_dev_s *dev);
static int up_attach(struct uart_dev_s *dev);
static void up_detach(struct uart_dev_s *dev);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int up_interrupte(int irq, void *context);
#endif
static int up_interrupts(int irq, void *context);
@@ -327,7 +327,7 @@ static struct up_dev_s g_uart0priv =
.uartbase = KINETIS_UART0_BASE,
.clock = BOARD_CORECLK_FREQ,
.baud = CONFIG_UART0_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART0E,
#endif
.irqs = KINETIS_IRQ_UART0S,
@@ -361,7 +361,7 @@ static struct up_dev_s g_uart1priv =
.uartbase = KINETIS_UART1_BASE,
.clock = BOARD_CORECLK_FREQ,
.baud = CONFIG_UART1_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART1E,
#endif
.irqs = KINETIS_IRQ_UART1S,
@@ -395,7 +395,7 @@ static struct up_dev_s g_uart2priv =
.uartbase = KINETIS_UART2_BASE,
.clock = BOARD_BUS_FREQ,
.baud = CONFIG_UART2_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART2E,
#endif
.irqs = KINETIS_IRQ_UART2S,
@@ -429,7 +429,7 @@ static struct up_dev_s g_uart3priv =
.uartbase = KINETIS_UART3_BASE,
.clock = BOARD_BUS_FREQ,
.baud = CONFIG_UART3_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART3E,
#endif
.irqs = KINETIS_IRQ_UART3S,
@@ -463,7 +463,7 @@ static struct up_dev_s g_uart4priv =
.uartbase = KINETIS_UART4_BASE,
.clock = BOARD_BUS_FREQ,
.baud = CONFIG_UART4_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART4E,
#endif
.irqs = KINETIS_IRQ_UART4S,
@@ -497,7 +497,7 @@ static struct up_dev_s g_uart5priv =
.uartbase = KINETIS_UART5_BASE,
.clock = BOARD_BUS_FREQ,
.baud = CONFIG_UART5_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.irqe = KINETIS_IRQ_UART5E,
#endif
.irqs = KINETIS_IRQ_UART5S,
@@ -626,7 +626,7 @@ static int up_setup(struct uart_dev_s *dev)
/* Set up the interrupt priority */
up_prioritize_irq(priv->irqs, priv->irqprio);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_prioritize_irq(priv->irqe, priv->irqprio);
#endif
#endif
@@ -681,7 +681,7 @@ static int up_attach(struct uart_dev_s *dev)
*/
ret = irq_attach(priv->irqs, up_interrupts);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (ret == OK)
{
ret = irq_attach(priv->irqe, up_interrupte);
@@ -690,7 +690,7 @@ static int up_attach(struct uart_dev_s *dev)
if (ret == OK)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_enable_irq(priv->irqe);
#endif
up_enable_irq(priv->irqs);
@@ -716,7 +716,7 @@ static void up_detach(struct uart_dev_s *dev)
/* Disable interrupts */
up_restoreuartint(priv, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_disable_irq(priv->irqe);
#endif
up_disable_irq(priv->irqs);
@@ -724,7 +724,7 @@ static void up_detach(struct uart_dev_s *dev)
/* Detach from the interrupt(s) */
irq_detach(priv->irqs);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_detach(priv->irqe);
#endif
}
@@ -738,7 +738,7 @@ static void up_detach(struct uart_dev_s *dev)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int up_interrupte(int irq, void *context)
{
struct uart_dev_s *dev = NULL;
@@ -808,7 +808,7 @@ static int up_interrupte(int irq, void *context)
regval = up_serialin(priv, KINETIS_UART_D_OFFSET);
return OK;
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
/****************************************************************************
* Name: up_interrupts
@@ -1064,7 +1064,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
}
else
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# warning "Revisit: How are errors enabled?"
priv->ie |= UART_C2_RIE;
#else
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index fdb76f455c3..e92edd72a09 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -86,7 +86,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_KHCI_USBDEV_REGDEBUG
# undef CONFIG_KHCI_USBDEV_BDTDEBUG
#endif
@@ -3237,7 +3237,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
bool bidi;
int index;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !desc)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3364,7 +3364,7 @@ static int khci_epdisable(struct usbdev_ep_s *ep)
int i;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3408,7 +3408,7 @@ static struct usbdev_req_s *khci_epallocreq(struct usbdev_ep_s *ep)
{
struct khci_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3437,7 +3437,7 @@ static void khci_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
struct khci_req_s *privreq = (struct khci_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3463,7 +3463,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
uint8_t epno;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3475,7 +3475,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3550,7 +3550,7 @@ static int khci_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct khci_ep_s *privep = (struct khci_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3737,7 +3737,7 @@ static int khci_epstall(struct usbdev_ep_s *ep, bool resume)
irqstate_t flags;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3798,7 +3798,7 @@ static struct usbdev_ep_s *khci_allocep(struct usbdev_s *dev, uint8_t epno,
uint16_t epset = KHCI_ENDP_ALLSET;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3856,7 +3856,7 @@ static void khci_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct khci_usbdev_s *priv;
struct khci_ep_s *privep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !ep)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3888,7 +3888,7 @@ static int khci_getframe(struct usbdev_s *dev)
uint16_t frmh;
uint16_t tmp;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3929,7 +3929,7 @@ static int khci_wakeup(struct usbdev_s *dev)
struct khci_usbdev_s *priv = (struct khci_usbdev_s *)dev;
usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3953,7 +3953,7 @@ static int khci_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -4532,7 +4532,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -4599,7 +4599,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/kl/Make.defs b/arch/arm/src/kl/Make.defs
index 39308b6948c..105d267a73a 100644
--- a/arch/arm/src/kl/Make.defs
+++ b/arch/arm/src/kl/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
CMN_CSRCS += up_elf.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CMN_CSRCS += up_dumpnvic.c
endif
@@ -101,6 +101,6 @@ ifeq ($(CONFIG_PWM),y)
CHIP_CSRCS += kl_pwm.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += kl_dumpgpio.c
endif
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index b6ea6de6283..961414b466f 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -48,14 +48,14 @@
#include "chip.h"
#include "kl_gpio.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Private Data
****************************************************************************/
/* Port letters for prettier debug output */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static const char g_portchar[KL_GPIO_NPORTS] =
{
#if KL_GPIO_NPORTS > 9
@@ -133,4 +133,4 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
leave_critical_section(flags);
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index 87d47ab35c0..1f62d1a0136 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -137,7 +137,7 @@ static void kl_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int kl_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -236,7 +236,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(KL_IRQ_NMI, kl_nmi);
irq_attach(KL_IRQ_PENDSV, kl_pendsv);
irq_attach(KL_IRQ_RESERVED, kl_reserved);
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 52249f34feb..72f1705d210 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -75,7 +75,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index eacebac98a2..e80de128ad8 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -65,9 +65,9 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
*
- * CONFIG_DEBUG - Define to enable general debug features
- * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
*/
#ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c
index 63491ac74d7..6e9970517f5 100644
--- a/arch/arm/src/kl/kl_start.c
+++ b/arch/arm/src/kl/kl_start.c
@@ -94,7 +94,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
*
****************************************************************************/
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES)
# define showprogress(c) kl_lowputc((uint32_t)c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/lpc11xx/Kconfig b/arch/arm/src/lpc11xx/Kconfig
index 45bb842a302..64badf0dbda 100644
--- a/arch/arm/src/lpc11xx/Kconfig
+++ b/arch/arm/src/lpc11xx/Kconfig
@@ -229,10 +229,11 @@ config CAN_LOOPBACK
config CAN_REGDEBUG
bool "Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Output detailed register-level CAN debug information. Requires also DEBUG and DEBUG_CAN.
+ Output detailed register-level CAN debug information. Requires also
+ CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_CAN.
endmenu
diff --git a/arch/arm/src/lpc11xx/Make.defs b/arch/arm/src/lpc11xx/Make.defs
index fd0e046964d..041419c2488 100644
--- a/arch/arm/src/lpc11xx/Make.defs
+++ b/arch/arm/src/lpc11xx/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
CMN_CSRCS += up_elf.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CMN_CSRCS += up_dumpnvic.c
endif
diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
index 6be8d9c55fe..5907c8df2ca 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
@@ -53,7 +53,7 @@
* Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index c6daaba380d..80a299926eb 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -133,7 +133,7 @@ static void lpc11_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int lpc11_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -232,7 +232,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(LPC11_IRQ_NMI, lpc11_nmi);
irq_attach(LPC11_IRQ_PENDSV, lpc11_pendsv);
irq_attach(LPC11_IRQ_RESERVED, lpc11_reserved);
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index 942ff3e2fc2..c0659651119 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -74,9 +74,9 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
*
- * CONFIG_DEBUG - Define to enable general debug features
- * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
*/
#ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index 7ebb1b3bdb6..a272f6f9406 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -75,9 +75,9 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
*
- * CONFIG_DEBUG - Define to enable general debug features
- * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
*/
#ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc11xx/lpc11_start.c b/arch/arm/src/lpc11xx/lpc11_start.c
index 78429691490..917cdeae275 100644
--- a/arch/arm/src/lpc11xx/lpc11_start.c
+++ b/arch/arm/src/lpc11xx/lpc11_start.c
@@ -86,7 +86,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index a7b995fd909..0201e259f7d 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -84,7 +84,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig
index 4bb53068bb6..e2315fedd7c 100644
--- a/arch/arm/src/lpc17xx/Kconfig
+++ b/arch/arm/src/lpc17xx/Kconfig
@@ -596,10 +596,11 @@ config CAN_LOOPBACK
config CAN_REGDEBUG
bool "Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Output detailed register-level CAN debug information. Requires also DEBUG and DEBUG_CAN.
+ Output detailed register-level CAN debug information. Requires also
+ CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_CAN.
endmenu
@@ -705,10 +706,10 @@ config NET_WOL
config NET_REGDEBUG
bool "Ethernet register-level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Enable low level register debug. Also needs DEBUG.
+ Enable low level register debug. Also needs CONFIG_DEBUG_FEATURES.
config NET_HASH
bool "Hashing"
@@ -900,10 +901,11 @@ config LPC17_USBDEV_NOLED
config LPC17_USBDEV_REGDEBUG
bool "Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Output detailed register-level USB device debug information. Requires also DEBUG.
+ Output detailed register-level USB device debug information. Requires
+ also CONFIG_DEBUG_FEATURES.
endmenu
@@ -976,9 +978,10 @@ config USBHOST_ISOC_DISABLE
config LPC17_USBHOST_REGDEBUG
bool "Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Output detailed register-level USB host debug information. Requires also DEBUG.
+ Output detailed register-level USB host debug information. Requires
+ also CONFIG_DEBUG_FEATURES.
endmenu
diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c
index fbec7c40e2a..eb347ff4c87 100644
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@@ -72,7 +72,7 @@
# error "CONFIG_RTC_HIRES must NOT be set with this driver"
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c
index ea08c70fe10..d7d46afd3fd 100644
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@@ -160,7 +160,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing CAN */
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
# undef CONFIG_CAN_REGDEBUG
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 5180204a322..c49b61ad5d2 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -127,9 +127,9 @@
#endif
/* Debug Configuration *****************************************************/
-/* Register debug -- can only happen of CONFIG_DEBUG is selected */
+/* Register debug -- can only happen of CONFIG_DEBUG_FEATURES is selected */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_REGDEBUG
#endif
@@ -137,7 +137,7 @@
* console.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_DUMPPACKET
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index fc6ce33162b..680e02a53d1 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -53,7 +53,7 @@
* Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index d1f72be399a..734308952e3 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -146,7 +146,7 @@ static void lpc17_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int lpc17_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -392,7 +392,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(LPC17_IRQ_NMI, lpc17_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(LPC17_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index 04c1830dad0..7fe1edee39c 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -83,7 +83,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index 3fdb7397ac6..756feb5f52d 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -101,7 +101,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index 3f5c5a5b66d..4ba4d8bbd3e 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -109,7 +109,7 @@
# error "Callback support requires CONFIG_SCHED_WORKQUEUE"
#endif
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES)
# undef CONFIG_DEBUG_SDIO
#endif
@@ -1955,7 +1955,7 @@ static int lpc17_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t respcmd;
#endif
uint32_t regval;
@@ -1984,7 +1984,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2016,7 +2016,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
fdbg("ERROR: CRC failure: %08x\n", regval);
ret = -EIO;
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
/* Check response received is of desired command */
@@ -2052,7 +2052,7 @@ static int lpc17_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2107,7 +2107,7 @@ static int lpc17_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
/* Check that this is the correct response to this command */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
{
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index 7853419cdcd..34f30a703e8 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -74,9 +74,9 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
*
- * CONFIG_DEBUG - Define to enable general debug features
- * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
*/
#ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index f80b12de1de..6685cb0723f 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -75,9 +75,9 @@
/* Debug ********************************************************************/
/* The following enable debug output from this file:
*
- * CONFIG_DEBUG - Define to enable general debug features
- * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
*/
#ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc17xx/lpc17_start.c b/arch/arm/src/lpc17xx/lpc17_start.c
index 8d95518d02d..3a0ae1d7055 100644
--- a/arch/arm/src/lpc17xx/lpc17_start.c
+++ b/arch/arm/src/lpc17xx/lpc17_start.c
@@ -82,7 +82,7 @@
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 198c099cd17..1138f6b38ea 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -84,7 +84,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 62495439afd..cb8f8366e88 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -99,7 +99,7 @@
# define USB_FRAME_INT 0
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define USB_ERROR_INT USBDEV_INT_ERRINT
#else
# undef CONFIG_LPC17_USBDEV_REGDEBUG
@@ -2090,7 +2090,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* USB engine error interrupt */
if ((devintstatus & USBDEV_INT_ERRINT) != 0)
@@ -2412,7 +2412,7 @@ static int lpc17_dmasetup(struct lpc17_usbdev_s *priv, uint8_t epphy,
struct lpc17_dmadesc_s *dmadesc = priv;
uint32_t regval;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || epphy < 2)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2611,7 +2611,7 @@ static int lpc17_epdisable(FAR struct usbdev_ep_s *ep)
uint32_t mask = (1 << privep->epphy);
uint32_t regval;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2653,7 +2653,7 @@ static FAR struct usbdev_req_s *lpc17_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct lpc17_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2685,7 +2685,7 @@ static void lpc17_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct lpc17_req_s *privreq = (FAR struct lpc17_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2793,7 +2793,7 @@ static int lpc17_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2878,7 +2878,7 @@ static int lpc17_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
FAR struct lpc17_ep_s *privep = (FAR struct lpc17_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3142,7 +3142,7 @@ static int lpc17_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3406,7 +3406,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -3456,7 +3456,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc214x/Kconfig b/arch/arm/src/lpc214x/Kconfig
index 68926095cf0..a9fc00c245e 100644
--- a/arch/arm/src/lpc214x/Kconfig
+++ b/arch/arm/src/lpc214x/Kconfig
@@ -140,7 +140,7 @@ config LPC214X_USBDEV_FRAME_INTERRUPT
config LPC214X_USBDEV_REGDEBUG
bool "USB Device Register-Level Debug Output"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu
endif
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 8db27f29ebd..c0d6c765100 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -280,7 +280,7 @@
*/
.macro showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov r0, #\code
bl up_lowputc
#endif
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index cce4c2adb0a..926a7a1280e 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -104,7 +104,7 @@
# define USB_FRAME_INT 0
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define USB_ERROR_INT USBDEV_DEVINT_EPRINT
#else
# define USB_ERROR_INT 0
@@ -382,7 +382,7 @@ struct lpc214x_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc214x_getreg(uint32_t addr);
static void lpc214x_putreg(uint32_t val, uint32_t addr);
#else
@@ -518,7 +518,7 @@ static const struct usbdev_ops_s g_devops =
*
****************************************************************************/
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc214x_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -581,7 +581,7 @@ static uint32_t lpc214x_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void lpc214x_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -2055,7 +2055,7 @@ static int lpc214x_usbinterrupt(int irq, FAR void *context)
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* USB engine error interrupt */
if ((devintstatus & USBDEV_DEVINT_EPRINT))
@@ -2378,7 +2378,7 @@ static int lpc214x_dmasetup(struct lpc214x_usbdev_s *priv, uint8_t epphy,
struct lpc214x_dmadesc_s *dmadesc = priv;
uint32_t reg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || epphy < 2)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2577,7 +2577,7 @@ static int lpc214x_epdisable(FAR struct usbdev_ep_s *ep)
uint32_t mask = (1 << privep->epphy);
uint32_t reg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2619,7 +2619,7 @@ static FAR struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct lpc214x_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2651,7 +2651,7 @@ static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_
{
FAR struct lpc214x_req_s *privreq = (FAR struct lpc214x_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2759,7 +2759,7 @@ static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2844,7 +2844,7 @@ static int lpc214x_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -3107,7 +3107,7 @@ static int lpc214x_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -3322,7 +3322,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -3372,7 +3372,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc2378/Kconfig b/arch/arm/src/lpc2378/Kconfig
index 08197970c66..eb9cba75701 100644
--- a/arch/arm/src/lpc2378/Kconfig
+++ b/arch/arm/src/lpc2378/Kconfig
@@ -185,7 +185,7 @@ config LPC2378_USBDEV_FRAME_INTERRUPT
config LPC2378_USBDEV_REGDEBUG
bool "USB Device Register-Level Debug Output"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu
endif
diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S
index 179b390271c..551f2d240e7 100644
--- a/arch/arm/src/lpc2378/lpc23xx_head.S
+++ b/arch/arm/src/lpc2378/lpc23xx_head.S
@@ -60,7 +60,7 @@
* modify r0, r1, r2 and r14
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.macro showprogress, code
mov r0, #\code
bl up_lowputc
diff --git a/arch/arm/src/lpc31xx/Kconfig b/arch/arm/src/lpc31xx/Kconfig
index ffdaa811460..e89430ec9b0 100644
--- a/arch/arm/src/lpc31xx/Kconfig
+++ b/arch/arm/src/lpc31xx/Kconfig
@@ -243,10 +243,11 @@ config LPC31_USBDEV_DMA
config LPC31_USBDEV_REGDEBUG
bool "Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
- Output detailed register-level USB device debug information. Requires also DEBUG.
+ Output detailed register-level USB device debug information. Requires
+ also CONFIG_DEBUG_FEATURES.
endmenu # USB device driver controller (DCD) options
endif # LPC31_USBOTG && USBDEV
@@ -300,7 +301,7 @@ config LPC31_EHCI_PREALLOCATE
config LPC31_EHCI_REGDEBUG
bool "Enable low-level EHCI register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # USB host controller driver (HCD) options
endif # LPC31_USBOTG && USBHOST
@@ -309,9 +310,9 @@ menu "SPI device driver options"
config LPC31_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on LPC31_SPI && DEBUG
+ depends on LPC31_SPI && DEBUG_FEATURES
default n
---help---
- Output detailed register-level SPI device debug information. Requires also DEBUG.
+ Output detailed register-level SPI device debug information. Requires also CONFIG_DEBUG_FEATURES.
endmenu # SPI device driver options
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index b881daea634..498d848da30 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -113,7 +113,7 @@
/* Debug options */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_LPC31_EHCI_REGDEBUG
#endif
@@ -124,7 +124,7 @@
/* Simplify DEBUG checks */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_USB
#endif
diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c
index f750ca0792d..fb4586e0090 100644
--- a/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -63,10 +63,10 @@
/* Debug ****************************************************************************/
/* CONFIG_LPC31_SPI_REGDEBUG enabled very low, register-level debug output.
- * CONFIG_DEBUG must also be defined
+ * CONFIG_DEBUG_FEATURES must also be defined
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_LPC31_SPI_REGDEBUG
#endif
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index 25a8bb60049..bcf51dbbe7a 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -100,7 +100,7 @@
# define USB_FRAME_INT 0
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define USB_ERROR_INT USBDEV_USBINTR_UEE
#else
# define USB_ERROR_INT 0
@@ -343,7 +343,7 @@ struct lpc31_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc31_getreg(uint32_t addr);
static void lpc31_putreg(uint32_t val, uint32_t addr);
#else
@@ -480,7 +480,7 @@ static const struct usbdev_ops_s g_devops =
*
****************************************************************************/
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc31_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -543,7 +543,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void lpc31_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -1536,7 +1536,7 @@ static void lpc31_ep0complete(struct lpc31_usbdev_s *priv, uint8_t epphy)
break;
default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
DEBUGASSERT(priv->ep0state != EP0STATE_DATA_IN &&
priv->ep0state != EP0STATE_DATA_OUT &&
priv->ep0state != EP0STATE_SHORTWRITE &&
@@ -1578,7 +1578,7 @@ static void lpc31_ep0nak(struct lpc31_usbdev_s *priv, uint8_t epphy)
lpc31_ep0state (priv, EP0STATE_WAIT_STATUS_OUT);
break;
default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
DEBUGASSERT(priv->ep0state != EP0STATE_WAIT_NAK_IN &&
priv->ep0state != EP0STATE_WAIT_NAK_OUT);
#endif
@@ -1939,7 +1939,7 @@ static int lpc31_epdisable(FAR struct usbdev_ep_s *ep)
FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -1977,7 +1977,7 @@ static FAR struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct lpc31_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2009,7 +2009,7 @@ static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct lpc31_req_s *privreq = (FAR struct lpc31_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2079,7 +2079,7 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2144,7 +2144,7 @@ static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2423,7 +2423,7 @@ static int lpc31_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2655,7 +2655,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -2716,7 +2716,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 9a2bcad916f..84868ab13fa 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -457,9 +457,9 @@ config LPC43_RMII
config LPC43_ETHERNET_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # Ethernet MAC configuration
endif # LPC43_ETHERNET
diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs
index 60e0ad3ed0f..6e5d7ef3a78 100644
--- a/arch/arm/src/lpc43xx/Make.defs
+++ b/arch/arm/src/lpc43xx/Make.defs
@@ -110,7 +110,7 @@ ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
CHIP_CSRCS += lpc43_idle.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += lpc43_debug.c
endif
diff --git a/arch/arm/src/lpc43xx/lpc43_debug.c b/arch/arm/src/lpc43xx/lpc43_debug.c
index 51cf9470672..06a5ea71fb9 100644
--- a/arch/arm/src/lpc43xx/lpc43_debug.c
+++ b/arch/arm/src/lpc43xx/lpc43_debug.c
@@ -47,7 +47,7 @@
#include "lpc43_pinconfig.h"
#include "lpc43_gpio.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Pre-processor Definitions
@@ -93,4 +93,4 @@ int lpc43_gpio_dump(uint16_t gpiocfg, const char *msg)
return -ENOSYS;
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index a170b01e217..0c536fcb6c0 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -105,7 +105,7 @@
/* Debug options */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_LPC43_EHCI_REGDEBUG
#endif
@@ -116,7 +116,7 @@
/* Simplify DEBUG checks */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_USB
#endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index 6b5e456c246..11da4b3d113 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -197,7 +197,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_LPC43_ETHMAC_REGDEBUG
#endif
@@ -559,7 +559,7 @@ static struct lpc43_ethmac_s g_lpc43ethmac;
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc43_getreg(uint32_t addr);
static void lpc43_putreg(uint32_t val, uint32_t addr);
static void lpc43_checksetup(void);
@@ -683,7 +683,7 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv);
*
****************************************************************************/
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc43_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -755,7 +755,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void lpc43_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -782,7 +782,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void lpc43_checksetup(void)
{
}
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index 37313b901e8..a84eba773a8 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -61,7 +61,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef DMA_DEBUG /* Define to enable debug */
#undef DMA_VERBOSE /* Define to enable verbose debug */
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.h b/arch/arm/src/lpc43xx/lpc43_gpio.h
index 4f16c841de4..24a492beaed 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.h
@@ -310,7 +310,7 @@ bool lpc43_gpio_read(uint16_t gpiocfg);
*
********************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int lpc43_gpio_dump(uint16_t gpiocfg, const char *msg);
#else
# define lpc43_gpio_dump(p,m)
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index a6e54b51f04..f45e9248c6d 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -155,7 +155,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int lpc43_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -336,7 +336,7 @@ static int lpc43_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
void up_irqinitialize(void)
{
uint32_t regaddr;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t regval;
#endif
int num_priority_registers;
@@ -427,7 +427,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(LPC43_IRQ_NMI, lpc43_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(LPC43_IRQ_MEMFAULT, up_memfault);
@@ -446,7 +446,7 @@ void up_irqinitialize(void)
* operation.
*/
-#if defined(CONFIG_DEBUG) && !defined(CONFIG_ARMV7M_USEBASEPRI)
+#if defined(CONFIG_DEBUG_FEATURES) && !defined(CONFIG_ARMV7M_USEBASEPRI)
regval = getreg32(NVIC_DEMCR);
regval &= ~NVIC_DEMCR_VCHARDERR;
putreg32(regval, NVIC_DEMCR);
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.h b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
index dad885d86bd..63e7d768bdc 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.h
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
@@ -264,7 +264,7 @@ int lpc43_pin_config(uint32_t pinconf);
*
********************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int lpc43_pin_dump(uint32_t pinconf, const char *msg);
#else
# define lpc43_pin_dump(p,m)
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.c b/arch/arm/src/lpc43xx/lpc43_rgu.c
index 9671a4f8a59..799e3c21e65 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.c
@@ -75,7 +75,7 @@
* Description:
* Reset as many of the LPC43 peripherals as possible. This is necessary
* because the LPC43 does not provide any way of performing a full system
- * reset under debugger control. So, if CONFIG_DEBUG is set (indicating
+ * reset under debugger control. So, if CONFIG_DEBUG_FEATURES is set (indicating
* that a debugger is being used?), the boot logic will call this
* function on all restarts.
*
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.h b/arch/arm/src/lpc43xx/lpc43_rgu.h
index 2d1604d23a4..f283a9aaf36 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.h
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.h
@@ -76,7 +76,7 @@ extern "C"
* Description:
* Reset as many of the LPC43 peripherals as possible. This is necessary
* because the LPC43 does not provide any way of performing a full system
- * reset under debugger control. So, if CONFIG_DEBUG is set (indicating
+ * reset under debugger control. So, if CONFIG_DEBUG_FEATURES is set (indicating
* that a debugger is being used?), the boot logic will call this
* function on all restarts.
*
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index bc9813f44d5..629f5654c98 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -64,7 +64,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index e7e183ab552..101f355546c 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -92,7 +92,7 @@
* from the SPI address space after each write.
* CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers. You
* probably do not want to enable this unless you want to dig through a
- * *lot* of debug output! Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ * *lot* of debug output! Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
* and CONFIG_DEBUG_FS,
*/
@@ -263,7 +263,7 @@
* enable this unless you want to dig through a *lot* of debug output!
*/
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
# undef CONFIG_DEBUG_SPIFI_DUMP
#endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 61c8ce3c4ed..141c7090f16 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -69,7 +69,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_SSP_DEBUG - Define to enable basic SSP debug
* CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c
index 80ffb581ee8..e3fe5c552e8 100644
--- a/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/arch/arm/src/lpc43xx/lpc43_start.c
@@ -87,7 +87,7 @@
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
@@ -271,12 +271,12 @@ void __start(void)
/* Reset as many of the LPC43 peripherals as possible. This is necessary
* because the LPC43 does not provide any way of performing a full system
- * reset under debugger control. So, if CONFIG_DEBUG is set (indicating
+ * reset under debugger control. So, if CONFIG_DEBUG_FEATURES is set (indicating
* that a debugger is being used?), the boot logic will call this
* function on all restarts.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
lpc43_softreset();
#endif
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 082f35eb3bc..6f0c36e8551 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -107,7 +107,7 @@
# define USB_FRAME_INT 0
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define USB_ERROR_INT USBDEV_USBINTR_UEE
#else
# define USB_ERROR_INT 0
@@ -361,7 +361,7 @@ struct lpc43_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc43_getreg(uint32_t addr);
static void lpc43_putreg(uint32_t val, uint32_t addr);
#else
@@ -501,7 +501,7 @@ static const struct usbdev_ops_s g_devops =
*
****************************************************************************/
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t lpc43_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -564,7 +564,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void lpc43_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -1623,7 +1623,7 @@ static void lpc43_ep0complete(struct lpc43_usbdev_s *priv, uint8_t epphy)
break;
default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
DEBUGASSERT(priv->ep0state != EP0STATE_DATA_IN &&
priv->ep0state != EP0STATE_DATA_OUT &&
priv->ep0state != EP0STATE_SHORTWRITE &&
@@ -1667,7 +1667,7 @@ static void lpc43_ep0nak(struct lpc43_usbdev_s *priv, uint8_t epphy)
break;
default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
DEBUGASSERT(priv->ep0state != EP0STATE_WAIT_NAK_IN &&
priv->ep0state != EP0STATE_WAIT_NAK_OUT);
#endif
@@ -2056,7 +2056,7 @@ static int lpc43_epdisable(FAR struct usbdev_ep_s *ep)
FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2100,7 +2100,7 @@ static FAR struct usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct lpc43_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2132,7 +2132,7 @@ static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct lpc43_req_s *privreq = (FAR struct lpc43_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2202,7 +2202,7 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2271,7 +2271,7 @@ static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2554,7 +2554,7 @@ static int lpc43_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2790,7 +2790,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -2851,7 +2851,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/nuc1xx/Make.defs b/arch/arm/src/nuc1xx/Make.defs
index 3a9f0651912..7a5a00e85a2 100644
--- a/arch/arm/src/nuc1xx/Make.defs
+++ b/arch/arm/src/nuc1xx/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
CMN_CSRCS += up_elf.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CMN_CSRCS += up_dumpnvic.c
endif
@@ -81,6 +81,6 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
CHIP_CSRCS += nuc_userspace.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += nuc_dumpgpio.c
endif
diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
index 480bb4f588d..77223498811 100644
--- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c
+++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
@@ -49,14 +49,14 @@
#include "chip.h"
#include "nuc_gpio.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Private Data
****************************************************************************/
/* Port letters for prettier debug output */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static const char g_portchar[NUC_GPIO_NPORTS] =
{
#if NUC_GPIO_NPORTS > 9
@@ -142,4 +142,4 @@ void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg)
leave_critical_section(flags);
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.h b/arch/arm/src/nuc1xx/nuc_gpio.h
index 52e9dd20950..1fca1dc0e50 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.h
+++ b/arch/arm/src/nuc1xx/nuc_gpio.h
@@ -245,7 +245,7 @@ bool nuc_gpioread(gpio_cfgset_t pinset);
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg);
#else
# define nuc_dumpgpio(p,m)
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index 0bdb86a8ee9..ee6f5f1824c 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -137,7 +137,7 @@ static void nuc_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int nuc_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -236,7 +236,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(NUC_IRQ_NMI, nuc_nmi);
irq_attach(NUC_IRQ_PENDSV, nuc_pendsv);
irq_attach(NUC_IRQ_RESERVED, nuc_reserved);
diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c
index 3cbb5becdee..80c01077ae8 100644
--- a/arch/arm/src/nuc1xx/nuc_start.c
+++ b/arch/arm/src/nuc1xx/nuc_start.c
@@ -92,7 +92,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(HAVE_SERIAL_CONSOLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(HAVE_SERIAL_CONSOLE)
# define showprogress(c) nuc_lowputc((uint32_t)c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index b588bae2cc8..ce158857cd2 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -1118,7 +1118,7 @@ config SAM34_SPI_DMATHRESHOLD
config SAM34_SPI_DMADEBUG
bool "SPI DMA transfer debug"
- depends on SAM34_SPI_DMA && DEBUG && DEBUG_DMA
+ depends on SAM34_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -1128,11 +1128,11 @@ config SAM34_SPI_DMADEBUG
config SAM34_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # AT91SAM3/4 SPI device driver options
endif # SAM34_SPI0 || SAM34_SPI1
@@ -1336,9 +1336,9 @@ config SAM34_EMAC_PHYSR_100FD
config SAM34_EMAC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
config SAM34_EMAC_ISETH0
bool
@@ -1400,7 +1400,7 @@ menu "AT91SAM3/4 USB Full Speed Device Controller driver (DCD) options"
config SAM34_UDP_REGDEBUG
bool "Enable low-level UDP register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # USB Full Speed Device Controller driver (DCD) options
@@ -1415,7 +1415,7 @@ menu "AT91SAM3/4 Timer/Counter options"
config SAM34_TC_REGDEBUG
bool "Enable low-level timer/counter register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # USB Full Speed Device Controller driver (DCD) options
diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index e71ffdb42b5..4da8e54a8b2 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -71,7 +71,7 @@
/* Timer debug is enabled if any timer client is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ANALOG
# undef CONFIG_SAMA5_TC_REGDEBUG
#endif
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index 2c60c958baf..d3d28992864 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -889,7 +889,7 @@ sam_allocdesc(struct sam_dma_s *dmach, struct dma_linklist_s *prev,
* Obviously setting it to zero would break that usage.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (src != 0)
#endif
{
diff --git a/arch/arm/src/sam34/sam_dmac.h b/arch/arm/src/sam34/sam_dmac.h
index 0ff4f2e1448..3b8a3cc2c41 100644
--- a/arch/arm/src/sam34/sam_dmac.h
+++ b/arch/arm/src/sam34/sam_dmac.h
@@ -52,7 +52,7 @@
/* Configuration ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
#endif
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index e6fdd770ede..8f6e5cec994 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -231,7 +231,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAM34_EMAC_REGDEBUG
#endif
@@ -346,7 +346,7 @@ static uint8_t g_rxbuffer[CONFIG_SAM34_EMAC_NRXBUFFERS * EMAC_RX_UNITSIZE]
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAM34_EMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_EMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
uint32_t regval, uintptr_t address);
static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sam34/sam_gpio.h b/arch/arm/src/sam34/sam_gpio.h
index f8f267ef5e3..32d579a12c1 100644
--- a/arch/arm/src/sam34/sam_gpio.h
+++ b/arch/arm/src/sam34/sam_gpio.h
@@ -77,7 +77,7 @@
# undef CONFIG_SAM34_GPIO_IRQ
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index bf5f3c6e718..80577859915 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -2035,7 +2035,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2095,7 +2095,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 2a8b2f990ed..d775907bd5d 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -171,7 +171,7 @@ static void sam_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int sam_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -456,7 +456,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(SAM_IRQ_NMI, sam_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index 1877f7d1115..98e06ad936d 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -80,7 +80,7 @@
#define RTC_MAGIC 0xdeadbeef
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index e2817231141..516153e191b 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -115,7 +115,7 @@ struct sam34_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr);
static void sam34_putreg(uint32_t val, uint32_t addr);
#else
@@ -193,7 +193,7 @@ static inline uint32_t sam34_readvr(void)
*
****************************************************************************/
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -256,7 +256,7 @@ static uint32_t sam34_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam34_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index ca9938782e9..adf2842ae7d 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -136,7 +136,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAM34_SPI_DMADEBUG
diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c
index dc1d449808a..abae1da7615 100644
--- a/arch/arm/src/sam34/sam_start.c
+++ b/arch/arm/src/sam34/sam_start.c
@@ -88,7 +88,7 @@ void __start(void) __attribute__ ((no_instrument_function));
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index 985249c6f6b..ed67d4b5caf 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -114,7 +114,7 @@ struct sam34_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr);
static void sam34_putreg(uint32_t val, uint32_t addr);
#else
@@ -174,7 +174,7 @@ static struct sam34_lowerhalf_s g_tcdevs[6];
*
****************************************************************************/
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -237,7 +237,7 @@ static uint32_t sam34_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam34_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 265c3f636d2..1b2030237f5 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -96,7 +96,7 @@
#define TWI_MAX_FREQUENCY 66000000 /* Maximum TWI frequency */
/* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index c1a30c9fc50..976867c706b 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -90,7 +90,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAM34_UDP_REGDEBUG
#endif
@@ -732,7 +732,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
* Name: sam_dumpep
****************************************************************************/
-#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno)
{
/* Global Registers */
@@ -2891,7 +2891,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
/* Verify parameters. Endpoint 0 is not available at this interface */
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
uint8_t epno = USB_EPNO(desc->addr);
usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
@@ -2942,7 +2942,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
irqstate_t flags;
uint8_t epno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -2979,7 +2979,7 @@ static struct usbdev_req_s *sam_ep_allocreq(struct usbdev_ep_s *ep)
{
struct sam_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3011,7 +3011,7 @@ static void sam_ep_freereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
struct sam_req_s *privreq = (struct sam_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3074,7 +3074,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
uint8_t epno;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3086,7 +3086,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3182,7 +3182,7 @@ static int sam_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct sam_ep_s *privep = (struct sam_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3208,7 +3208,7 @@ static int sam_ep_stallresume(struct usbdev_ep_s *ep, bool resume)
irqstate_t flags;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3283,7 +3283,7 @@ static struct usbdev_ep_s *sam_allocep(struct usbdev_s *dev, uint8_t epno,
uint16_t epset = SAM_EPSET_NOTEP0;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3345,7 +3345,7 @@ static void sam_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct sam_usbdev_s *priv;
struct sam_ep_s *privep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3377,7 +3377,7 @@ static int sam_getframe(struct usbdev_s *dev)
uint32_t regval;
uint16_t frameno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3409,7 +3409,7 @@ static int sam_wakeup(struct usbdev_s *dev)
uint32_t regval;
usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3480,7 +3480,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3926,7 +3926,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -4000,7 +4000,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index 92dde867560..be009258426 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam34_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr);
static void sam34_putreg(uint32_t val, uint32_t addr);
#else
@@ -176,7 +176,7 @@ static struct sam34_lowerhalf_s g_wdgdev;
*
****************************************************************************/
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam34_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -239,7 +239,7 @@ static uint32_t sam34_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam34_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index da7da52e391..19ffbf03525 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -1393,9 +1393,9 @@ endif # SAMA5_LCDC_HCR
config SAMA5_LCDC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # LCDC configuration
endif # SAMA5_LCDC
@@ -1499,9 +1499,9 @@ endif # !SAMA5_GMAC_AUTONEG
config SAMA5_GMAC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # GMAC device driver options
endif # SAMA5_GMAC
@@ -1678,9 +1678,9 @@ config SAMA5_EMACA_NBC
config SAMA5_EMACA_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # EMAC device driver options
endif # SAMA5_EMACA
@@ -2076,7 +2076,7 @@ config SAMA5_EMACB_NBC
config SAMA5_EMACB_DEBUG
bool "Force EMAC0/1 DEBUG"
default n
- depends on DEBUG && !DEBUG_NET
+ depends on DEBUG_FEATURES && !DEBUG_NET
---help---
This option will force debug output from EMAC driver even without
network debug output enabled. This is not normally something
@@ -2087,9 +2087,9 @@ config SAMA5_EMACB_DEBUG
config SAMA5_EMACB_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # EMAC device driver options
endif # SAMA5_EMACB
@@ -2323,11 +2323,11 @@ config SAMA5_CAN_AUTOBAUD
config SAMA5_CAN_REGDEBUG
bool "CAN Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level CAN device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # CAN device driver options
endif # SAMA5_CAN0 || SAMA5_CAN1
@@ -2354,7 +2354,7 @@ config SAMA5_SPI_DMATHRESHOLD
config SAMA5_SPI_DMADEBUG
bool "SPI DMA transfer debug"
- depends on SAMA5_SPI_DMA && DEBUG && DEBUG_DMA
+ depends on SAMA5_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -2364,11 +2364,11 @@ config SAMA5_SPI_DMADEBUG
config SAMA5_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # SPI device driver options
endif # SAMA5_SPI0 || SAMA5_SPI1
@@ -2399,11 +2399,11 @@ config SAMA5_TWI3_FREQUENCY
config SAMA5_TWI_REGDEBUG
bool "TWI register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level TWI device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # TWI device driver options
endif # SAMA5_TWI0 || SAMA5_TWI1 || SAMA5_TWI2 || SAMA5_TWI3
@@ -2766,7 +2766,7 @@ endif # SAMA5_SSC1
config SAMA5_SSC_DMADEBUG
bool "SSC DMA transfer debug"
- depends on DEBUG && DEBUG_DMA
+ depends on DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze SSC DMA data transfers.
@@ -2776,11 +2776,11 @@ config SAMA5_SSC_DMADEBUG
config SAMA5_SSC_REGDEBUG
bool "SSC Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SSC device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
config SAMA5_SSC_QDEBUG
bool "SSC Queue debug"
@@ -2881,11 +2881,11 @@ config SAMA5_HSMCI_CMDDEBUG
config SAMA5_HSMCI_REGDEBUG
bool "HSMCI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level HSCMI device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # HSMCI device driver options
endif # SAMA5_HSMCI0 || SAMA5_HSMCI1 || SAMA5_HSMCI2
@@ -2920,7 +2920,7 @@ config SAMA5_UDPHS_PREALLOCATE
config SAMA5_UDPHS_REGDEBUG
bool "Enable low-level UDPHS register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # USB High Speed Device Controller driver (DCD) options
endif # SAMA5_UDPHS
@@ -2960,7 +2960,7 @@ config SAMA5_OHCI_TDBUFSIZE
config SAMA5_OHCI_REGDEBUG
bool "Enable low-level OHCI register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endif # SAMA5_OHCI
@@ -3009,7 +3009,7 @@ config SAMA5_EHCI_PREALLOCATE
config SAMA5_EHCI_REGDEBUG
bool "Enable low-level EHCI register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endif # SAMA5_EHCI
@@ -3661,7 +3661,7 @@ endif # SAMA5_ADC_HAVE_CHAN
config SAMA5_ADC_REGDEBUG
bool "Enable register-level ADC/touchscreen debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable very low register-level debug output.
@@ -3903,11 +3903,11 @@ endif
config SAMA5_TC_DEBUG
bool "TC debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output high level Timer/Counter device debug information.
- Requires also DEBUG. If this option AND CONFIG_DEBUG_INFO are
+ Requires also CONFIG_DEBUG_FEATURES. If this option AND CONFIG_DEBUG_INFO are
enabled, then the system will be overwhelmed the timer debug
output. If CONFIG_DEBUG_INFO is disabled, then debug output will
only indicate if/when timer-related errors occur. This
@@ -3915,11 +3915,11 @@ config SAMA5_TC_DEBUG
config SAMA5_TC_REGDEBUG
bool "TC register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level Timer/Counter device debug
- information. Very invasive! Requires also DEBUG.
+ information. Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # Timer/counter Configuration
endif # SAMA5_HAVE_TC
@@ -4150,7 +4150,7 @@ endif # SAMA5_PWM_CHAN3
config SAMA5_PWM_REGDEBUG
bool "Enable register-level PWM debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable very low register-level debug output.
@@ -4171,8 +4171,8 @@ config SAMA5_WDT_INTERRUPT
config SAMA5_WDT_DEBUGHALT
bool "Halt on DEBUG"
- default y if DEBUG
- default n if !DEBUG
+ default y if DEBUG_FEATURES
+ default n if !DEBUG_FEATURES
---help---
Halt the watchdog timer in the debug state
@@ -4185,7 +4185,7 @@ config SAMA5_WDT_IDLEHALT
config SAMA5_WDT_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable low-level register debug output
@@ -4688,7 +4688,7 @@ endif # SAMA5_HAVE_PMECC
config SAMA5_NAND_DMADEBUG
bool "NAND DMA transfer debug"
- depends on SAMA5_NAND_DMA && DEBUG && DEBUG_DMA
+ depends on SAMA5_NAND_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze NAND DMA data transfers.
@@ -4699,18 +4699,18 @@ config SAMA5_NAND_DMADEBUG
config SAMA5_NAND_REGDEBUG
bool "Register-Level NAND Debug"
default n
- depends on DEBUG && DEBUG_FS
+ depends on DEBUG_FEATURES && DEBUG_FS
---help---
- Enable very low-level register access debug. Depends on DEBUG and
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES and
DEBUG_FS.
config SAMA5_NAND_DUMP
bool "NAND data dump"
default n
- depends on DEBUG && DEBUG_FS
+ depends on DEBUG_FEATURES && DEBUG_FS
---help---
Dump the contents of all data read and written to FLAH. Depends on
- DEBUG and DEBUG_FS.
+ CONFIG_DEBUG_FEATURES and DEBUG_FS.
endif # SAMA5_HAVE_NAND
endmenu # External Memory Configuration
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index e1e30719962..82208b0bdce 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -423,7 +423,7 @@ struct sam_adc_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_ADC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_ADC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_adc_checkreg(struct sam_adc_s *priv, bool wr,
uint32_t regval, uintptr_t address);
#endif
diff --git a/arch/arm/src/sama5/sam_adc.h b/arch/arm/src/sama5/sam_adc.h
index f8ba29f1576..f84a45a65d0 100644
--- a/arch/arm/src/sama5/sam_adc.h
+++ b/arch/arm/src/sama5/sam_adc.h
@@ -57,7 +57,7 @@
# error Work queue support is required (CONFIG_SCHED_WORKQUEUE)
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_ADC_REGDEBUG
#endif
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index 2689ac414ff..b9a3ee38924 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -138,7 +138,7 @@
# define canllinfo(x...)
#endif
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
# undef CONFIG_SAMA5_CAN_REGDEBUG
#endif
@@ -893,7 +893,7 @@ static int can_setup(FAR struct can_dev_s *dev)
/* Enable all error interrupts */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
can_putreg(priv, SAM_CAN_IER_OFFSET, CAN_DEBUG_INTS);
#endif
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index f86edd31699..8c305b5a9b6 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -1364,7 +1364,7 @@ sam_allocdesc(struct sam_dmach_s *dmach, struct dma_linklist_s *prev,
* Obviously setting it to zero would break that usage.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (saddr != 0)
#endif
{
diff --git a/arch/arm/src/sama5/sam_dmac.h b/arch/arm/src/sama5/sam_dmac.h
index c9fc885369d..b6ba92c23f1 100644
--- a/arch/arm/src/sama5/sam_dmac.h
+++ b/arch/arm/src/sama5/sam_dmac.h
@@ -52,7 +52,7 @@
/* Configuration ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
#endif
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 8d41577c7db..f5affbb5154 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -112,7 +112,7 @@
/* Debug options */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_EHCI_REGDEBUG
#endif
@@ -129,7 +129,7 @@
/* Simplify DEBUG checks */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_USB
#endif
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 755ccc1dd9c..ff99f550f78 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -223,7 +223,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_EMACA_REGDEBUG
#endif
@@ -335,7 +335,7 @@ static uint8_t g_rxbuffer[CONFIG_SAMA5_EMAC_NRXBUFFERS * EMAC_RX_UNITSIZE]
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_EMACA_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_EMACA_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
uint32_t regval, uintptr_t address);
static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index c6fe757a983..b593a15181f 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -58,7 +58,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SAMA5_EMACB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SAMA5_EMACB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
@@ -295,7 +295,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_EMACB_REGDEBUG
#endif
@@ -459,7 +459,7 @@ struct sam_emac_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_EMACB_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_EMACB_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
uint32_t regval, uintptr_t address);
#endif
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index fd06f414de2..8ba0aed7089 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -149,7 +149,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_GMAC_REGDEBUG
#endif
@@ -260,7 +260,7 @@ static uint8_t g_rxbuffer[CONFIG_SAMA5_GMAC_NRXBUFFERS * GMAC_RX_UNITSIZE]
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_GMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_GMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(struct sam_gmac_s *priv, bool wr,
uint32_t regval, uintptr_t address);
static uint32_t sam_getreg(struct sam_gmac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 2e13488a598..adbfa2bc044 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -2490,7 +2490,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2550,7 +2550,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index cc2b4bf1c8a..821a18ec619 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -492,7 +492,7 @@
/* Debug */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_LCDC_REGDEBUG
#endif
@@ -666,7 +666,7 @@ struct sam_lcdc_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_LCDC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_LCDC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(bool wr, uint32_t regval, uintptr_t address);
static uint32_t sam_getreg(uintptr_t addr);
static void sam_putreg(uintptr_t addr, uint32_t val);
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index f4229b8d6c0..1467d29945a 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -259,7 +259,7 @@
/* Debug */
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_FS)
# undef CONFIG_DEBUG_FS
# undef CONFIG_SAMA5_NAND_DMADEBUG
# undef CONFIG_SAMA5_NAND_REGDEBUG
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 65e5111d566..7aae6c7be1b 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -151,7 +151,7 @@
/* Debug */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_OHCI_REGDEBUG
#endif
@@ -2835,7 +2835,7 @@ errout:
static int sam_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
struct sam_rhport_s *rhport = (struct sam_rhport_s *)drvr;
#endif
struct sam_eplist_s *eplist = (struct sam_eplist_s *)ep;
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index c80cf5812ea..5d07e57a623 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -396,7 +396,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index 05600d9ec17..0260a947b60 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -77,7 +77,7 @@
#define RTC_MAGIC 0xdeadbeef
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 646a848bee5..b681de8b29d 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -129,7 +129,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMA5_SPI_DMADEBUG
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 97ce8ce964a..480d0e9d9fe 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -397,7 +397,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
@@ -476,7 +476,7 @@ struct sam_ssc_s
uintptr_t base; /* SSC controller register base address */
sem_t exclsem; /* Assures mutually exclusive acess to SSC */
uint8_t datalen; /* Data width (8, 16, or 32) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint8_t align; /* Log2 of data width (0, 1, or 3) */
#endif
uint8_t pid; /* Peripheral ID */
@@ -2059,19 +2059,19 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
switch (bits)
{
case 8:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 0;
#endif
break;
case 16:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 1;
#endif
break;
case 32:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 3;
#endif
break;
@@ -3257,7 +3257,7 @@ static void ssc0_configure(struct sam_ssc_s *priv)
priv->base = SAM_SSC0_VBASE;
priv->datalen = CONFIG_SAMA5_SSC0_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = SAMA5_SSC0_DATAMASK;
#endif
priv->pid = SAM_PID_SSC0;
@@ -3398,7 +3398,7 @@ static void ssc1_configure(struct sam_ssc_s *priv)
priv->base = SAM_SSC1_VBASE;
priv->datalen = CONFIG_SAMA5_SSC1_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = SAMA5_SSC1_DATAMASK;
#endif
priv->pid = SAM_PID_SSC1;
diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h
index 8d5df8423ea..7a6f8dbba2a 100644
--- a/arch/arm/src/sama5/sam_tc.h
+++ b/arch/arm/src/sama5/sam_tc.h
@@ -74,7 +74,7 @@
/* Timer debug is enabled if any timer client is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ANALOG
# undef CONFIG_SAMA5_TC_REGDEBUG
#endif
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index d430898dde4..5aa22b90a79 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -124,7 +124,7 @@
#define MKI2C_OUTPUT(p) (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_OUTPUT)
/* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index 72d8bb82417..a73cb0e4208 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -95,7 +95,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMA5_UDPHS_REGDEBUG
#endif
@@ -797,7 +797,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
* Name: sam_dumpep
****************************************************************************/
-#if defined(CONFIG_SAMA5_UDPHS_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_UDPHS_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
{
/* Global Registers */
@@ -3397,7 +3397,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
/* Verify parameters. Endpoint 0 is not available at this interface */
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
uint8_t epno = USB_EPNO(desc->addr);
usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
@@ -3436,7 +3436,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
irqstate_t flags;
uint8_t epno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3473,7 +3473,7 @@ static struct usbdev_req_s *sam_ep_allocreq(struct usbdev_ep_s *ep)
{
struct sam_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3505,7 +3505,7 @@ static void sam_ep_freereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
struct sam_req_s *privreq = (struct sam_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3568,7 +3568,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
uint8_t epno;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3580,7 +3580,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3660,7 +3660,7 @@ static int sam_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct sam_ep_s *privep = (struct sam_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3687,7 +3687,7 @@ static int sam_ep_stall(struct usbdev_ep_s *ep, bool resume)
uint32_t regval;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3826,7 +3826,7 @@ static struct usbdev_ep_s *sam_allocep(struct usbdev_s *dev, uint8_t epno,
uint16_t epset = SAM_EPSET_NOTEP0;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3888,7 +3888,7 @@ static void sam_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct sam_usbdev_s *priv;
struct sam_ep_s *privep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !ep)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3920,7 +3920,7 @@ static int sam_getframe(struct usbdev_s *dev)
uint32_t regval;
uint16_t frameno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3952,7 +3952,7 @@ static int sam_wakeup(struct usbdev_s *dev)
uint32_t regval;
usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3998,7 +3998,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -4517,7 +4517,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -4591,7 +4591,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index 8e1141543a5..e5507a39499 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr);
static void sam_putreg(uint32_t regval, uintptr_t regaddr);
#else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
*
****************************************************************************/
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr)
{
static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
*
****************************************************************************/
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_putreg(uint32_t regval, uintptr_t regaddr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 77301c5c439..609823acb63 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -1330,7 +1330,7 @@ sam_allocdesc(struct sam_xdmach_s *xdmach, struct chnext_view1_s *prev,
* Obviously setting it to zero would break that usage.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (csa != 0)
#endif
{
@@ -1650,7 +1650,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
static inline int sam_multiple(struct sam_xdmach_s *xdmach)
{
struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
struct chnext_view1_s *llhead = xdmach->llhead;
#endif
uintptr_t paddr;
diff --git a/arch/arm/src/sama5/sama5d2x_pio.h b/arch/arm/src/sama5/sama5d2x_pio.h
index 4b37166d4b3..6f4f28f9a44 100644
--- a/arch/arm/src/sama5/sama5d2x_pio.h
+++ b/arch/arm/src/sama5/sama5d2x_pio.h
@@ -58,7 +58,7 @@
# undef CONFIG_SAMA5_PIO_IRQ
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.h b/arch/arm/src/sama5/sama5d3x4x_pio.h
index 63b6615b556..86ae2017450 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.h
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.h
@@ -52,7 +52,7 @@
# undef CONFIG_SAMA5_PIO_IRQ
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/samdl/Make.defs b/arch/arm/src/samdl/Make.defs
index d9a82f959e5..7ef0105780b 100644
--- a/arch/arm/src/samdl/Make.defs
+++ b/arch/arm/src/samdl/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
CMN_CSRCS += up_elf.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CMN_CSRCS += up_dumpnvic.c
endif
diff --git a/arch/arm/src/samdl/sam_dmac.h b/arch/arm/src/samdl/sam_dmac.h
index cc1c60e7a0c..86224469ffd 100644
--- a/arch/arm/src/samdl/sam_dmac.h
+++ b/arch/arm/src/samdl/sam_dmac.h
@@ -64,7 +64,7 @@
/* Configuration ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
#endif
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index 3f12b9943ac..42b65d814fc 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -93,7 +93,7 @@ volatile uint32_t *g_current_regs[1];
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int sam_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -192,7 +192,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(SAM_IRQ_NMI, sam_nmi);
irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
irq_attach(SAM_IRQ_RESERVED, sam_reserved);
diff --git a/arch/arm/src/samdl/sam_port.h b/arch/arm/src/samdl/sam_port.h
index 26ba8bcb5d3..3e9704cd141 100644
--- a/arch/arm/src/samdl/sam_port.h
+++ b/arch/arm/src/samdl/sam_port.h
@@ -379,7 +379,7 @@ bool sam_portread(port_pinset_t pinset);
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int sam_dumpport(port_pinset_t pinset, const char *msg);
#else
# define sam_dumpport(p,m)
diff --git a/arch/arm/src/samdl/sam_sercom.c b/arch/arm/src/samdl/sam_sercom.c
index ae50ca39c1e..e44e895a878 100644
--- a/arch/arm/src/samdl/sam_sercom.c
+++ b/arch/arm/src/samdl/sam_sercom.c
@@ -162,7 +162,7 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
#ifdef CONFIG_SAMDL_SERCOM5
static bool configured5 = false;
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
#ifdef HAVE_SERCOM0_4
static uint8_t slowgen = 0xff;
#endif
@@ -205,12 +205,12 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
*/
configured = true;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
slowgen = (uint8_t)gclkgen;
#endif
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Already configured. This is okay provided that the same GCLK
* generator is being used. Otherwise, there is a problem.
*/
@@ -236,12 +236,12 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
*/
configured5 = true;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
slowgen5 = (uint8_t)gclkgen;
#endif
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Already configured. This is okay provided that the same GCLK
* generator is being used. Otherwise, there is a problem.
*/
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index 78bc1b9cf36..b78ef8c5488 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -84,7 +84,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMDL_SPI_REGDEBUG
diff --git a/arch/arm/src/samdl/sam_start.c b/arch/arm/src/samdl/sam_start.c
index e31a1b274df..f46e114fd66 100644
--- a/arch/arm/src/samdl/sam_start.c
+++ b/arch/arm/src/samdl/sam_start.c
@@ -91,7 +91,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(HAVE_SERIAL_CONSOLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(HAVE_SERIAL_CONSOLE)
# define showprogress(c) sam_lowputc((uint32_t)c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index e5d70d93a73..8b5c3b6870e 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -687,8 +687,8 @@ config SAMV7_WDT_INTERRUPT
config SAMV7_WDT_DEBUGHALT
bool "Halt on DEBUG"
- default y if DEBUG
- default n if !DEBUG
+ default y if DEBUG_FEATURES
+ default n if !DEBUG_FEATURES
---help---
Halt the watchdog timer in the debug state
@@ -701,7 +701,7 @@ config SAMV7_WDT_IDLEHALT
config SAMV7_WDT_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable low-level register debug output
@@ -721,8 +721,8 @@ config SAMV7_RSWDT_INTERRUPT
config SAMV7_RSWDT_DEBUGHALT
bool "Halt on DEBUG"
- default y if DEBUG
- default n if !DEBUG
+ default y if DEBUG_FEATURES
+ default n if !DEBUG_FEATURES
---help---
Halt the watchdog timer in the debug state
@@ -735,7 +735,7 @@ config SAMV7_RSWDT_IDLEHALT
config SAMV7_RSWDT_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable low-level register debug output
@@ -853,7 +853,7 @@ config SAMV7_SPI_DMATHRESHOLD
config SAMV7_SPI_DMADEBUG
bool "SPI DMA transfer debug"
- depends on SAMV7_SPI_DMA && DEBUG && DEBUG_DMA
+ depends on SAMV7_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -877,11 +877,11 @@ endif # SAMV7_SPI_SLAVE
config SAMV7_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # SPI device driver options
@@ -914,7 +914,7 @@ config SAMV7_QSPI_DMATHRESHOLD
config SAMV7_QSPI_DMADEBUG
bool "QSPI DMA transfer debug"
- depends on SAMV7_QSPI_DMA && DEBUG && DEBUG_DMA
+ depends on SAMV7_QSPI_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze QSPI DMA data transfers.
@@ -924,11 +924,11 @@ config SAMV7_QSPI_DMADEBUG
config SAMV7_QSPI_REGDEBUG
bool "QSPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level QSPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # QSPI device driver options
@@ -952,11 +952,11 @@ config SAMV7_TWIHS2_FREQUENCY
config SAMV7_TWIHS_REGDEBUG
bool "TWIHS register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level TWIHS device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # TWIHS device driver options
@@ -1318,7 +1318,7 @@ endif # SAMV7_SSC1
config SAMV7_SSC_DMADEBUG
bool "SSC DMA transfer debug"
- depends on DEBUG && DEBUG_DMA
+ depends on DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation analyze SSC DMA data transfers.
@@ -1328,11 +1328,11 @@ config SAMV7_SSC_DMADEBUG
config SAMV7_SSC_REGDEBUG
bool "SSC Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SSC device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
config SAMV7_SSC_QDEBUG
bool "SSC Queue debug"
@@ -1551,11 +1551,11 @@ endif
config SAMV7_TC_DEBUG
bool "TC debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output high level Timer/Counter device debug information.
- Requires also DEBUG. If this option AND CONFIG_DEBUG_INFO are
+ Requires also CONFIG_DEBUG_FEATURES. If this option AND CONFIG_DEBUG_INFO are
enabled, then the system will be overwhelmed the timer debug
output. If CONFIG_DEBUG_INFO is disabled, then debug output will
only indicate if/when timer-related errors occur. This
@@ -1563,11 +1563,11 @@ config SAMV7_TC_DEBUG
config SAMV7_TC_REGDEBUG
bool "TC register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level Timer/Counter device debug
- information. Very invasive! Requires also DEBUG.
+ information. Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # Timer/counter Configuration
endif # SAMV7_HAVE_TC
@@ -1641,11 +1641,11 @@ config SAMV7_HSMCI_CMDDEBUG
config SAMV7_HSMCI_REGDEBUG
bool "HSMCI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level HSCMI device debug information.
- Very invasive! Requires also DEBUG.
+ Very invasive! Requires also CONFIG_DEBUG_FEATURES.
endmenu # HSMCI device driver options
@@ -1854,7 +1854,7 @@ config SAMV7_EMAC_NBC
config SAMV7_EMAC_DEBUG
bool "Force EMAC0/1 DEBUG"
default n
- depends on DEBUG && !DEBUG_NET
+ depends on DEBUG_FEATURES && !DEBUG_NET
---help---
This option will force debug output from EMAC driver even without
network debug output enabled. This is not normally something
@@ -1865,9 +1865,9 @@ config SAMV7_EMAC_DEBUG
config SAMV7_EMAC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # EMAC0 device driver options
@@ -1923,7 +1923,7 @@ config SAMV7_USBHS_EP7DMA_WAR
config SAMV7_USBHS_REGDEBUG
bool "Enable low-level USBHS register debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # USB High Speed Device Controller driver (DCD) options
@@ -2598,11 +2598,11 @@ endmenu # MCAN1 device driver options
config SAMV7_MCAN_REGDEBUG
bool "CAN Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level CAN device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # CAN device driver options
endif # SAMV7_MCAN
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index e03cd76e6c9..ff39b0c6591 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -48,7 +48,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SAMV7_EMAC_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SAMV7_EMAC_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
@@ -307,7 +307,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMV7_EMAC_REGDEBUG
#endif
@@ -560,7 +560,7 @@ struct sam_emac_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMV7_EMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_EMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
uint32_t regval, uintptr_t address);
#endif
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 10b0cff4b50..0bc9daf9190 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -2521,7 +2521,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2582,7 +2582,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 963b87db1da..3f7c5eeabb6 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -171,7 +171,7 @@ static void sam_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int sam_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -456,7 +456,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(SAM_IRQ_NMI, sam_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 15c91047817..6e31dcac6d3 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -789,7 +789,7 @@
/* Debug ********************************************************************/
/* Debug configurations that may be enabled just for testing MCAN */
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
# undef CONFIG_SAMV7_MCAN_REGDEBUG
#endif
@@ -2829,7 +2829,7 @@ static bool mcan_txready(FAR struct can_dev_s *dev)
FAR struct sam_mcan_s *priv = dev->cd_priv;
uint32_t regval;
bool notfull;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int sval;
#endif
@@ -2846,7 +2846,7 @@ static bool mcan_txready(FAR struct can_dev_s *dev)
regval = mcan_getreg(priv, SAM_MCAN_TXFQS_OFFSET);
notfull = ((regval & MCAN_TXFQS_TFQF) == 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* As a sanity check, the txfsem should also track the number of elements
* the TX FIFO/queue. Make sure that they are consistent.
*/
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index b08490f2489..cee4d5110fd 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -142,7 +142,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMV7_QSPI_DMADEBUG
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index c9f08e444cd..b188c3dfd69 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr);
static void sam_putreg(uint32_t regval, uintptr_t regaddr);
#else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
*
****************************************************************************/
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr)
{
static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
*
****************************************************************************/
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_putreg(uint32_t regval, uintptr_t regaddr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 454947d5722..3c264eb4e6d 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -124,7 +124,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMV7_SPI_DMADEBUG
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index b2203519cb4..4b1ee3bb602 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -79,7 +79,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 52891da5888..7c1b45a557e 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -370,7 +370,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
@@ -449,7 +449,7 @@ struct sam_ssc_s
uintptr_t base; /* SSC controller register base address */
sem_t exclsem; /* Assures mutually exclusive acess to SSC */
uint8_t datalen; /* Data width (8, 16, or 32) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint8_t align; /* Log2 of data width (0, 1, or 3) */
#endif
uint8_t pid; /* Peripheral ID */
@@ -2036,19 +2036,19 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
switch (bits)
{
case 8:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 0;
#endif
break;
case 16:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 1;
#endif
break;
case 32:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = 3;
#endif
break;
@@ -3231,7 +3231,7 @@ static void ssc0_configure(struct sam_ssc_s *priv)
priv->base = SAM_SSC0_BASE;
priv->datalen = CONFIG_SAMV7_SSC0_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = SAMV7_SSC0_DATAMASK;
#endif
priv->pid = SAM_PID_SSC0;
@@ -3372,7 +3372,7 @@ static void ssc1_configure(struct sam_ssc_s *priv)
priv->base = SAM_SSC1_BASE;
priv->datalen = CONFIG_SAMV7_SSC1_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->align = SAMV7_SSC1_DATAMASK;
#endif
priv->pid = SAM_PID_SSC1;
diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h
index 15673deaf9e..9efd00d6079 100644
--- a/arch/arm/src/samv7/sam_tc.h
+++ b/arch/arm/src/samv7/sam_tc.h
@@ -75,7 +75,7 @@
/* Timer debug is enabled if any timer client is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ANALOG
# undef CONFIG_SAMV7_TC_REGDEBUG
#endif
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 3e242d8525b..87123462aa1 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -121,7 +121,7 @@
#define MKI2C_OUTPUT(p) (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_OUTPUT)
/* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index c7c2275b986..a2f0774079b 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -112,7 +112,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_SAMV7_USBHS_REGDEBUG
#endif
@@ -869,7 +869,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
* Name: sam_dumpep
****************************************************************************/
-#if defined(CONFIG_SAMV7_USBHS_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_USBHS_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
{
/* Global Registers */
@@ -3730,7 +3730,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
/* Verify parameters. Endpoint 0 is not available at this interface */
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
uint8_t epno = USB_EPNO(desc->addr);
usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index cd156021e35..efcb01b92ee 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr);
static void sam_putreg(uint32_t regval, uintptr_t regaddr);
#else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
*
****************************************************************************/
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t sam_getreg(uintptr_t regaddr)
{
static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
*
****************************************************************************/
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void sam_putreg(uint32_t regval, uintptr_t regaddr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index c52f63fb9b7..f04782980fa 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -1020,7 +1020,7 @@ sam_allocdesc(struct sam_xdmach_s *xdmach, struct chnext_view1_s *prev,
* Obviously setting it to zero would break that usage.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (csa != 0)
#endif
{
@@ -1340,7 +1340,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
static inline int sam_multiple(struct sam_xdmach_s *xdmach)
{
struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
struct chnext_view1_s *llhead = xdmach->llhead;
#endif
uintptr_t paddr;
diff --git a/arch/arm/src/samv7/sam_xdmac.h b/arch/arm/src/samv7/sam_xdmac.h
index fe98581d08b..775591f94a5 100644
--- a/arch/arm/src/samv7/sam_xdmac.h
+++ b/arch/arm/src/samv7/sam_xdmac.h
@@ -52,7 +52,7 @@
/* Configuration ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
#endif
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index a9b89773ead..c1e277fc2bf 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -6215,9 +6215,9 @@ endchoice
config STM32_ETHMAC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu
endif
@@ -6307,14 +6307,14 @@ config STM32_USBHOST_REGDEBUG
default n
depends on USBHOST && (STM32_OTGFS || STM32_OTGHS)
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug.
config STM32_USBHOST_PKTDUMP
bool "Packet Dump Debug"
default n
depends on USBHOST && (STM32_OTGFS || STM32_OTGHS)
---help---
- Dump all incoming and outgoing USB packets. Depends on DEBUG.
+ Dump all incoming and outgoing USB packets.
endmenu
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 0b691c270d2..1a3355d24d4 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -247,7 +247,7 @@ ifeq ($(CONFIG_STM32_WWDG),y)
CHIP_CSRCS += stm32_wwdg.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += stm32_dumpgpio.c
endif
diff --git a/arch/arm/src/stm32/stm32.h b/arch/arm/src/stm32/stm32.h
index a1cc224f59d..f52fa2cb4aa 100644
--- a/arch/arm/src/stm32/stm32.h
+++ b/arch/arm/src/stm32/stm32.h
@@ -59,7 +59,7 @@
* depend on CONFIG_DEBUG_INFO
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
# undef CONFIG_DEBUG_RTC
# undef CONFIG_DEBUG_I2C
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 29545492efe..b361133f1fd 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -96,7 +96,7 @@
# define canllinfo(x...)
#endif
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
# undef CONFIG_CAN_REGDEBUG
#endif
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index 77d49ffa084..4e4f4327c5f 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -49,14 +49,14 @@
#include "stm32_gpio.h"
#include "stm32_rcc.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Private Data
****************************************************************************/
/* Port letters for prettier debug output */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static const char g_portchar[STM32_NGPIO_PORTS] =
{
#if STM32_NGPIO_PORTS > 11
@@ -238,4 +238,4 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
return OK;
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 481538aedd6..19c5e3aee18 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -240,7 +240,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STM32_ETHMAC_REGDEBUG
#endif
@@ -622,7 +622,7 @@ static struct stm32_ethmac_s g_stm32ethmac[STM32_NETHERNET];
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr);
static void stm32_checksetup(void);
@@ -748,7 +748,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv);
*
****************************************************************************/
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -820,7 +820,7 @@ static uint32_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -847,7 +847,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_checksetup(void)
{
}
diff --git a/arch/arm/src/stm32/stm32_gpio.h b/arch/arm/src/stm32/stm32_gpio.h
index c1790eaaaa3..34b49bf0d6d 100644
--- a/arch/arm/src/stm32/stm32_gpio.h
+++ b/arch/arm/src/stm32/stm32_gpio.h
@@ -510,7 +510,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
*
************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int stm32_dumpgpio(uint32_t pinset, const char *msg);
#else
# define stm32_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index e1d7e3cade1..6b4728cf6a9 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -162,7 +162,7 @@
#define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index cc0aa02120f..3ed1e6939d1 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -169,7 +169,7 @@
#define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index e6a347c00ac..803345b3810 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -158,7 +158,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int stm32_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -408,7 +408,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(STM32_IRQ_NMI, stm32_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index 85af854ef4d..1e52b26a01d 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -143,7 +143,7 @@ struct stm32_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr);
#else
@@ -195,7 +195,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
*
****************************************************************************/
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -258,7 +258,7 @@ static uint16_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 2d347ad8700..05325986a66 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -472,7 +472,7 @@ struct stm32_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr);
#else
@@ -792,7 +792,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
*
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -855,7 +855,7 @@ static uint32_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -4185,7 +4185,7 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
{
FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4225,7 +4225,7 @@ static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct stm32_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4258,7 +4258,7 @@ static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4330,7 +4330,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
/* Some sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4342,7 +4342,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
usbtrace(TRACE_EPSUBMIT, privep->epphy);
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4419,7 +4419,7 @@ static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4877,7 +4877,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -5560,7 +5560,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -5631,7 +5631,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index ba0d451d43a..f2ce8e2abd4 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -93,9 +93,9 @@
* CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
* want to do that?
* CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- * debug. Depends on CONFIG_DEBUG.
+ * debug. Depends on CONFIG_DEBUG_FEATURES.
* CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- * packets. Depends on CONFIG_DEBUG.
+ * packets. Depends on CONFIG_DEBUG_FEATURES.
*/
/* Pre-requisites (partial) */
@@ -128,9 +128,9 @@
# define CONFIG_STM32_OTGFS_DESCSIZE 128
#endif
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STM32_USBHOST_REGDEBUG
# undef CONFIG_STM32_USBHOST_PKTDUMP
#endif
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index 7df1b921cea..6d14771b6d9 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -472,7 +472,7 @@ struct stm32_usbdev_s
/* Register operations ********************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr);
#else
@@ -792,7 +792,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
*
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -855,7 +855,7 @@ static uint32_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -4185,7 +4185,7 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
{
FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4225,7 +4225,7 @@ static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct stm32_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4258,7 +4258,7 @@ static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
{
FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4330,7 +4330,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
/* Some sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4342,7 +4342,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
usbtrace(TRACE_EPSUBMIT, privep->epphy);
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4419,7 +4419,7 @@ static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4877,7 +4877,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -5549,7 +5549,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -5620,7 +5620,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 4a81571791e..66f82147835 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -93,9 +93,9 @@
* CONFIG_STM32_OTGHS_SOFINTR - Enable SOF interrupts. Why would you ever
* want to do that?
* CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- * debug. Depends on CONFIG_DEBUG.
+ * debug. Depends on CONFIG_DEBUG_FEATURES.
* CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- * packets. Depends on CONFIG_DEBUG.
+ * packets. Depends on CONFIG_DEBUG_FEATURES.
*/
/* Pre-requisites (partial) */
@@ -128,9 +128,9 @@
# define CONFIG_STM32_OTGHS_DESCSIZE 128
#endif
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STM32_USBHOST_REGDEBUG
# undef CONFIG_STM32_USBHOST_PKTDUMP
#endif
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 0af0465bffa..549edeae6d9 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -117,7 +117,7 @@
/* Debug ********************************************************************/
/* Non-standard debug that may be enabled just for testing PWM */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_PWM
#endif
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 4b438a7e72f..8c856b25c4a 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -247,7 +247,7 @@
/* Debug ****************************************************************************/
/* Non-standard debug that may be enabled just for testing the quadrature encoder */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SENSORS
#endif
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index 3b0877775a9..1f1cbcaae7f 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -76,7 +76,7 @@
# error "CONFIG_STM32_PWR must selected to use this driver"
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 7244877af66..ae31eb5ccd7 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -139,7 +139,7 @@
# undef CONFIG_SDIO_DMAPRIO
#endif
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES)
# undef CONFIG_SDIO_XFRDEBUG
#endif
@@ -2060,7 +2060,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t respcmd;
#endif
uint32_t regval;
@@ -2089,7 +2089,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rshort)
{
fdbg("ERROR: rshort=NULL\n");
@@ -2121,7 +2121,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
fdbg("ERROR: CRC failure: %08x\n", regval);
ret = -EIO;
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
/* Check response received is of desired command */
@@ -2157,7 +2157,7 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
* 0 1 End bit
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2212,7 +2212,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
/* Check that this is the correct response to this command */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
{
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 6c3f7eea90d..f589b83efa1 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -159,7 +159,7 @@
/* Debug ****************************************************************************/
/* Check if (non-standard) SPI debug is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c
index 8e58e862a9e..480d5f58b46 100644
--- a/arch/arm/src/stm32/stm32_start.c
+++ b/arch/arm/src/stm32/stm32_start.c
@@ -81,7 +81,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 5f352dc26c3..631c936d744 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -103,7 +103,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STM32_USBDEV_REGDEBUG
#endif
@@ -388,7 +388,7 @@ struct stm32_usbdev_s
/* Register operations ******************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr);
static void stm32_checksetup(void);
@@ -652,7 +652,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
* Name: stm32_getreg
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -710,7 +710,7 @@ static uint16_t stm32_getreg(uint32_t addr)
* Name: stm32_putreg
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -727,7 +727,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
* Name: stm32_dumpep
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_dumpep(int epno)
{
uint32_t addr;
@@ -770,7 +770,7 @@ static void stm32_dumpep(int epno)
* Name: stm32_checksetup
****************************************************************************/
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_checksetup(void)
{
uint32_t cfgr = getreg32(STM32_RCC_CFGR);
@@ -2840,7 +2840,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
uint16_t maxpacket;
uint8_t epno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !desc)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2936,7 +2936,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep)
irqstate_t flags;
uint8_t epno;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2971,7 +2971,7 @@ static struct usbdev_req_s *stm32_epallocreq(struct usbdev_ep_s *ep)
{
struct stm32_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2999,7 +2999,7 @@ static void stm32_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
struct stm32_req_s *privreq = (struct stm32_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3024,7 +3024,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
uint8_t epno;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3036,7 +3036,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3136,7 +3136,7 @@ static int stm32_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct stm32_ep_s *privep = (struct stm32_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3163,7 +3163,7 @@ static int stm32_epstall(struct usbdev_ep_s *ep, bool resume)
uint16_t status;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3305,7 +3305,7 @@ static struct usbdev_ep_s *stm32_allocep(struct usbdev_s *dev, uint8_t epno,
int bufno;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3379,7 +3379,7 @@ static void stm32_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct stm32_usbdev_s *priv;
struct stm32_ep_s *privep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !ep)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3410,7 +3410,7 @@ static int stm32_getframe(struct usbdev_s *dev)
{
uint16_t fnr;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3435,7 +3435,7 @@ static int stm32_wakeup(struct usbdev_s *dev)
irqstate_t flags;
usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3473,7 +3473,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3834,7 +3834,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -3912,7 +3912,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_usbhost.h b/arch/arm/src/stm32/stm32_usbhost.h
index 2a6a7335446..7c036a8fa61 100644
--- a/arch/arm/src/stm32/stm32_usbhost.h
+++ b/arch/arm/src/stm32/stm32_usbhost.h
@@ -236,7 +236,7 @@ enum usbhost_trace1codes_e
* want to do that?
*
* CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- * debug. Depends on CONFIG_DEBUG.
+ * debug. Depends on CONFIG_DEBUG_FEATURES.
*/
/************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index dd20476f57d..a65bfadf965 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -119,7 +119,7 @@ struct stm32_lowerhalf_s
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr);
#else
@@ -179,7 +179,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
*
****************************************************************************/
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint16_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -242,7 +242,7 @@ static uint16_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint16_t val, uint32_t addr)
{
/* Show the register value being written */
diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c
index 643ca1ecd86..d3ed1ae31cd 100644
--- a/arch/arm/src/stm32/stm32f30xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c
@@ -154,7 +154,7 @@
#define STATUS_BUSY(status) (status & I2C_ISR_BUSY)
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index 0f79fc17098..e513066a6aa 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -81,7 +81,7 @@
# error "CONFIG_STM32_PWR must selected to use this driver"
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index e77c028ec05..e4bb50c8848 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1856,9 +1856,9 @@ endchoice
config STM32F7_ETHMAC_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu
endif # STM32F7_ETHMAC
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 2f4b7b25134..a23e141e21b 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -149,6 +149,6 @@ ifeq ($(CONFIG_STM32F7_ETHMAC),y)
CHIP_CSRCS += stm32_ethernet.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += stm32_dumpgpio.c
endif
diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c
index 24429b01e20..fcd3357efe5 100644
--- a/arch/arm/src/stm32f7/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c
@@ -51,7 +51,7 @@
#include "stm32_gpio.h"
#include "stm32_rcc.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Content of this file requires verification before it is used with other
* families
@@ -65,7 +65,7 @@
****************************************************************************/
/* Port letters for prettier debug output */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static const char g_portchar[STM32F7_NGPIO] =
{
#if STM32F7_NGPIO > 11
@@ -156,4 +156,4 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
}
#endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index 1123d0b0a9a..af0e4614466 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -263,7 +263,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STM32F7_ETHMAC_REGDEBUG
#endif
@@ -664,7 +664,7 @@ static struct stm32_ethmac_s g_stm32ethmac[STM32F7_NETHERNET];
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr);
static void stm32_checksetup(void);
@@ -795,7 +795,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv);
*
****************************************************************************/
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t stm32_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -867,7 +867,7 @@ static uint32_t stm32_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -894,7 +894,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void stm32_checksetup(void)
{
}
diff --git a/arch/arm/src/stm32f7/stm32_gpio.h b/arch/arm/src/stm32f7/stm32_gpio.h
index 7fff5e24998..e08aac39f77 100644
--- a/arch/arm/src/stm32f7/stm32_gpio.h
+++ b/arch/arm/src/stm32f7/stm32_gpio.h
@@ -345,7 +345,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
*
************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int stm32_dumpgpio(uint32_t pinset, const char *msg);
#else
# define stm32_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index a52e3e56d93..ca3c5f64fb8 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -183,7 +183,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int stm32_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -490,7 +490,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(STM32_IRQ_NMI, stm32_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig
index eccd8469bfb..6bc1cc99209 100644
--- a/arch/arm/src/stm32l4/Kconfig
+++ b/arch/arm/src/stm32l4/Kconfig
@@ -333,7 +333,7 @@ config STM32L4_QSPI_DMATHRESHOLD
config STM32L4_QSPI_DMADEBUG
bool "QSPI DMA transfer debug"
- depends on STM32L4_QSPI_DMA && DEBUG && DEBUG_DMA
+ depends on STM32L4_QSPI_DMA && DEBUG_FEATURES && DEBUG_DMA
default n
---help---
Enable special debug instrumentation to analyze QSPI DMA data transfers.
@@ -343,11 +343,11 @@ config STM32L4_QSPI_DMADEBUG
config STM32L4_QSPI_REGDEBUG
bool "QSPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level QSPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endif
diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs
index d7b602efe47..a1acddd1bad 100644
--- a/arch/arm/src/stm32l4/Make.defs
+++ b/arch/arm/src/stm32l4/Make.defs
@@ -150,7 +150,7 @@ CHIP_CSRCS += stm32l4_rtcc.c
endif
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CHIP_CSRCS += stm32l4_dumpgpio.c
endif
diff --git a/arch/arm/src/stm32l4/stm32l4.h b/arch/arm/src/stm32l4/stm32l4.h
index 11cba6d3637..1b0973e891d 100644
--- a/arch/arm/src/stm32l4/stm32l4.h
+++ b/arch/arm/src/stm32l4/stm32l4.h
@@ -59,7 +59,7 @@
* NOTE: Some of these also depend on CONFIG_DEBUG_INFO
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_DMA
# undef CONFIG_DEBUG_RTC
# undef CONFIG_DEBUG_I2C
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 3781de996e6..00789f419b8 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -97,7 +97,7 @@
# define canllinfo(x...)
#endif
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
# undef CONFIG_CAN_REGDEBUG
#endif
diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.h b/arch/arm/src/stm32l4/stm32l4_gpio.h
index 185af4810fb..49f8c95fa5d 100644
--- a/arch/arm/src/stm32l4/stm32l4_gpio.h
+++ b/arch/arm/src/stm32l4/stm32l4_gpio.h
@@ -350,7 +350,7 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
*
************************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int stm32l4_dumpgpio(uint32_t pinset, const char *msg);
#else
# define stm32l4_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 08bc407719f..679739d995f 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -146,7 +146,7 @@
#define STATUS_BUSY(status) (status & I2C_ISR_BUSY)
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index e0e963c66df..ebf76d7fd26 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -157,7 +157,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int stm32l4_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -403,7 +403,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(STM32L4_IRQ_NMI, stm32l4_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(STM32L4_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 06c136014ee..7a932930ebe 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -89,7 +89,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_STM32L4_QSPI_DMADEBUG
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index 2c349abfd98..c13ddf14421 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -83,7 +83,7 @@
# error "CONFIG_STM32L4_PWR must selected to use this driver"
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 712ed7c9150..b3f9b0db170 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -140,7 +140,7 @@
/* Debug ****************************************************************************/
/* Check if (non-standard) SPI debug is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c
index 6209cde5418..1c391851b4b 100644
--- a/arch/arm/src/stm32l4/stm32l4_start.c
+++ b/arch/arm/src/stm32l4/stm32l4_start.c
@@ -120,7 +120,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index c908ae9e3a1..bdf8015e912 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -132,7 +132,7 @@ void up_decodeirq(uint32_t *regs)
CURRENT_REGS = savestate;
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
PANIC(); /* Normally never happens */
diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index 6a299e8911b..c35715e02d2 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -67,7 +67,7 @@
#ifdef CONFIG_ARCH_LEDS
.globl board_autoled_initialize /* Boot LED setup */
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.globl up_lowputc /* Low-level debug output */
#endif
.globl os_start /* NuttX entry point */
@@ -86,7 +86,7 @@
*****************************************************************************/
.macro showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov r0, #\code
bl up_lowputc
#endif
diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index 20be1413092..5cda5b394d4 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -783,7 +783,7 @@ config TIVA_I2C_HIGHSPEED
config TIVA_I2C_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enables extremely detailed register access debug output.
@@ -840,7 +840,7 @@ endif # TIVA_TIMER_16BIT
config TIVA_TIMER_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enables extremely detailed register access debug output.
@@ -853,7 +853,7 @@ menu "ADC Configuration"
config TIVA_ADC_REGDEBUG
bool "Register level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enables extremely detailed register access debug output.
@@ -1103,9 +1103,9 @@ config TIVA_EMAC_HWCHECKSUM
config TIVA_ETHERNET_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
- Enable very low-level register access debug. Depends on DEBUG.
+ Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
endmenu # Tiva Ethernet Configuration
diff --git a/arch/arm/src/tiva/tiva_adc.h b/arch/arm/src/tiva/tiva_adc.h
index 693252ad35d..7f6edd4f9d8 100644
--- a/arch/arm/src/tiva/tiva_adc.h
+++ b/arch/arm/src/tiva/tiva_adc.h
@@ -52,7 +52,7 @@
* Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_TIVA_ADC_REGDEBUG
#endif
diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c
index 89ae3a462b2..c40c4329203 100644
--- a/arch/arm/src/tiva/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/tiva_dumpgpio.c
@@ -136,7 +136,7 @@ static inline uint8_t tiva_gpioport(int port)
int tiva_dumpgpio(uint32_t pinset, const char *msg)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irqstate_t flags;
unsigned int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
uintptr_t base;
@@ -191,7 +191,7 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
}
leave_critical_section(flags);
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
return OK;
}
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index 94a90937fff..86fda2d4f27 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -321,7 +321,7 @@
/* Debug ********************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_GPIO
#endif
diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c
index bf19f58248d..29772636078 100644
--- a/arch/arm/src/tiva/tiva_i2c.c
+++ b/arch/arm/src/tiva/tiva_i2c.c
@@ -119,7 +119,7 @@
#define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
/* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
@@ -129,7 +129,7 @@
# define i2cinfo(x...)
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_TIVA_I2C_REGDEBUG
#endif
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index 67f8f180602..b934efdf05d 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -195,7 +195,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int tiva_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
@@ -474,7 +474,7 @@ void up_irqinitialize(void)
/* Attach all other processor exceptions (except reset and sys tick) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
irq_attach(TIVA_IRQ_NMI, tiva_nmi);
#ifndef CONFIG_ARM_MPU
irq_attach(TIVA_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index b4147b15675..a70b06198c8 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
* CONFIG_DEBUG_INFO too)
*/
@@ -719,7 +719,7 @@ static int ssi_performtx(struct tiva_ssidev_s *priv)
* when the Tx FIFO is 1/2 full or less.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
regval |= (SSI_IM_TX | SSI_RIS_ROR);
#else
regval |= SSI_IM_TX;
@@ -792,7 +792,7 @@ static inline void ssi_performrx(struct tiva_ssidev_s *priv)
* interrupt, probably an Rx timeout).
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
regval |= (SSI_IM_RX | SSI_IM_RT | SSI_IM_ROR);
#else
regval |= (SSI_IM_RX | SSI_IM_RT);
diff --git a/arch/arm/src/tiva/tiva_start.c b/arch/arm/src/tiva/tiva_start.c
index 6ecc46223eb..db2abcc5ec7 100644
--- a/arch/arm/src/tiva/tiva_start.c
+++ b/arch/arm/src/tiva/tiva_start.c
@@ -78,7 +78,7 @@
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
#else
# define showprogress(c)
diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c
index 5a77fc5c4b6..395949471f4 100644
--- a/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c_ethernet.c
@@ -247,7 +247,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_TIVA_ETHERNET_REGDEBUG
#endif
@@ -667,7 +667,7 @@ static struct tiva_ethmac_s g_tiva_ethmac[TIVA_NETHCONTROLLERS];
****************************************************************************/
/* Register operations ******************************************************/
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t tiva_getreg(uint32_t addr);
static void tiva_putreg(uint32_t val, uint32_t addr);
static void tiva_checksetup(void);
@@ -787,7 +787,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv);
*
****************************************************************************/
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static uint32_t tiva_getreg(uint32_t addr)
{
static uint32_t prevaddr = 0;
@@ -859,7 +859,7 @@ static uint32_t tiva_getreg(uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void tiva_putreg(uint32_t val, uint32_t addr)
{
/* Show the register value being written */
@@ -886,7 +886,7 @@ static void tiva_putreg(uint32_t val, uint32_t addr)
*
****************************************************************************/
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
static void tiva_checksetup(void)
{
}
diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c
index 66c92862f55..653825cce4e 100644
--- a/arch/arm/src/tms570/tms570_boot.c
+++ b/arch/arm/src/tms570/tms570_boot.c
@@ -122,7 +122,7 @@ static inline void tms570_event_export(void)
static inline void tms570_check_reset(void)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t regval;
/* Read from the system exception status register to identify the cause of
diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c
index 98a8d2cd2fa..63b7fe95cd8 100644
--- a/arch/avr/src/at90usb/at90usb_usbdev.c
+++ b/arch/avr/src/at90usb/at90usb_usbdev.c
@@ -2247,7 +2247,7 @@ static int avr_epdisable(FAR struct usbdev_ep_s *ep)
FAR struct avr_ep_s *privep = (FAR struct avr_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2279,7 +2279,7 @@ static FAR struct usbdev_req_s *avr_epallocreq(FAR struct usbdev_ep_s *ep)
{
FAR struct avr_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2312,7 +2312,7 @@ static void avr_epfreereq(FAR struct usbdev_ep_s *ep,
{
FAR struct avr_req_s *privreq = (FAR struct avr_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2382,7 +2382,7 @@ static int avr_epsubmit(FAR struct usbdev_ep_s *ep,
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2484,7 +2484,7 @@ static int avr_epcancel(FAR struct usbdev_ep_s *ep,
FAR struct avr_ep_s *privep = (FAR struct avr_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2582,7 +2582,7 @@ static FAR struct usbdev_ep_s *avr_allocep(FAR struct usbdev_s *dev,
* requested 'logical' endpoint.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (epno >= AVR_NENDPOINTS)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_BADEPNO), (uint16_t)epno);
@@ -2725,7 +2725,7 @@ static int avr_selfpowered(struct usbdev_s *dev, bool selfpowered)
{
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t) selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2872,7 +2872,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -2927,7 +2927,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
{
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != g_usbdev.driver)
{
usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/avr/src/avr/up_createstack.c b/arch/avr/src/avr/up_createstack.c
index c2dda4d271d..6d6dce9d473 100644
--- a/arch/avr/src/avr/up_createstack.c
+++ b/arch/avr/src/avr/up_createstack.c
@@ -122,7 +122,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index fe414afd8f3..d529b335095 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 0e784430127..f04fe9844c1 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/arch/avr/src/avr32/up_createstack.c b/arch/avr/src/avr32/up_createstack.c
index db76abc38d9..59c470383f0 100644
--- a/arch/avr/src/avr32/up_createstack.c
+++ b/arch/avr/src/avr32/up_createstack.c
@@ -140,7 +140,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 37a5f25f55c..a57893c831f 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/avr/src/avr32/up_initialstate.c b/arch/avr/src/avr32/up_initialstate.c
index 821637423ae..641d6278bda 100644
--- a/arch/avr/src/avr32/up_initialstate.c
+++ b/arch/avr/src/avr32/up_initialstate.c
@@ -85,7 +85,7 @@ void up_initial_state(struct tcb_s *tcb)
* all registers is a good debug helper, but should not be necessary.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
memset(xcp, 0, sizeof(struct xcptcontext));
#else
/* No pending signal delivery */
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index d6f71f6e5c7..44be0773392 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,12 +79,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP)) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 936a79d2331..521aa259451 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -66,7 +66,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -140,7 +140,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 5c36cd08144..96773046478 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -120,7 +120,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/hc/src/common/up_createstack.c b/arch/hc/src/common/up_createstack.c
index 9afb471e470..9ae87865d06 100644
--- a/arch/hc/src/common/up_createstack.c
+++ b/arch/hc/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index f80a4c3b0e0..f20932ba611 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -74,7 +74,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -148,7 +148,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 30daa39ea29..e6728f0ea88 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -69,7 +69,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 4911c81145f..0241009fc60 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,12 +79,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/hc/src/m9s12/m9s12_gpio.c b/arch/hc/src/m9s12/m9s12_gpio.c
index 7d43f0a3d8a..0004bdf5de7 100644
--- a/arch/hc/src/m9s12/m9s12_gpio.c
+++ b/arch/hc/src/m9s12/m9s12_gpio.c
@@ -304,7 +304,7 @@ static inline void pim_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin)
DEBUGASSERT(portndx < HCS12_PIM_NPORTS);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((cfgset & GPIO_INT_ENABLE) != 0)
{
/* Yes.. then it must not be tagged as an output */
diff --git a/arch/hc/src/m9s12/m9s12_start.S b/arch/hc/src/m9s12/m9s12_start.S
index 49d31b4e1dd..3747967f5b7 100644
--- a/arch/hc/src/m9s12/m9s12_start.S
+++ b/arch/hc/src/m9s12/m9s12_start.S
@@ -82,7 +82,7 @@
*/
.macro showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
ldab \code
#ifdef CONFIG_HCS12_SERIALMON
jsr #PutChar
diff --git a/arch/mips/src/common/up_createstack.c b/arch/mips/src/common/up_createstack.c
index 5540b8bc4f8..e4f9520b3ba 100644
--- a/arch/mips/src/common/up_createstack.c
+++ b/arch/mips/src/common/up_createstack.c
@@ -158,7 +158,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index 36a1d2b1704..5f167488ccf 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -76,7 +76,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -150,7 +150,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index b7df229f2f0..e9ebdbbf98f 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -71,7 +71,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 4332d3d8c2a..c10048a4cff 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -79,12 +79,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index 3ef9e89df67..bf507e5e4aa 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index 1d335b17924..bf394921d07 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -61,7 +61,7 @@
/* Debug output from this file may interfere with context switching! To get
* debug output you must enabled the following in your NuttX configuration:
*
- * CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL
+ * CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL
*/
#ifdef CONFIG_DEBUG_SYSCALL
diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 3da65ead359..6d24c3e355a 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -1034,11 +1034,11 @@ config PIC32MX_SPI_ENHBUF
config PIC32MX_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # SPI Driver Configuration
@@ -1097,9 +1097,9 @@ config NET_WOL
config NET_REGDEBUG
bool "Register level debug"
default n
- depends on PIC32MX_ETHERNET && DEBUG
+ depends on PIC32MX_ETHERNET && DEBUG_FEATURES
---help---
- Enabled low level register debug. Also needs DEBUG.
+ Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES.
config NET_HASH
bool "Hash"
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index a5c7e483909..9004af4be5c 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -141,11 +141,11 @@
#define PIC32MX_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1)
/* Debug Configuration *****************************************************/
-/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG is selected.
+/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected.
* This will probably generate much more output than you care to see.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_REGDEBUG
# undef CONFIG_NET_DESCDEBUG
#endif
@@ -154,7 +154,7 @@
* console.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_DUMPPACKET
#endif
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 71b76180cb6..756ebbe80d3 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -85,7 +85,7 @@
uint32_t *pic32mx_exception(uint32_t *regs)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t cause;
uint32_t epc;
#endif
@@ -96,7 +96,7 @@ uint32_t *pic32mx_exception(uint32_t *regs)
board_autoled_on(LED_INIRQ);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Get the cause of the exception from the CAUSE register */
asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index e07a44fc3da..928ce85d9f1 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpio.c
@@ -303,7 +303,7 @@ bool pic32mx_gpioread(uint16_t pinset)
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
void pic32mx_dumpgpio(uint32_t pinset, const char *msg)
{
unsigned int port = pic32mx_portno(pinset);
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index 590c5998a15..f36679aaa5f 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -494,7 +494,7 @@ static int up_interrupt(int irq, void *context)
* - Overflow condition for the receive buffer OERR (UxSTA bit 1) occurs
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (up_pending_irq(priv->irqe))
{
/* Clear the pending error interrupt */
@@ -700,7 +700,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
*/
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_enable_irq(priv->irqe);
#endif
up_enable_irq(priv->irqrx);
@@ -709,7 +709,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
}
else
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_disable_irq(priv->irqe);
#endif
up_disable_irq(priv->irqrx);
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 0cf450fd010..613e7eccfa0 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -83,7 +83,7 @@
* enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_PIC32MX_USBDEV_REGDEBUG
# undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
#endif
@@ -3148,7 +3148,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
bool bidi;
int index;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !desc)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3275,7 +3275,7 @@ static int pic32mx_epdisable(struct usbdev_ep_s *ep)
int i;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3319,7 +3319,7 @@ static struct usbdev_req_s *pic32mx_epallocreq(struct usbdev_ep_s *ep)
{
struct pic32mx_req_s *privreq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3347,7 +3347,7 @@ static void pic32mx_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
struct pic32mx_req_s *privreq = (struct pic32mx_req_s *)req;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3372,7 +3372,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
uint8_t epno;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!req || !req->callback || !req->buf || !ep)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3384,7 +3384,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
priv = privep->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->driver)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3459,7 +3459,7 @@ static int pic32mx_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct pic32mx_ep_s *privep = (struct pic32mx_ep_s *)ep;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !req)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3646,7 +3646,7 @@ static int pic32mx_epstall(struct usbdev_ep_s *ep, bool resume)
irqstate_t flags;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3707,7 +3707,7 @@ static struct usbdev_ep_s *pic32mx_allocep(struct usbdev_s *dev, uint8_t epno,
uint16_t epset = PIC32MX_ENDP_ALLSET;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3765,7 +3765,7 @@ static void pic32mx_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct pic32mx_usbdev_s *priv;
struct pic32mx_ep_s *privep;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !ep)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3797,7 +3797,7 @@ static int pic32mx_getframe(struct usbdev_s *dev)
uint16_t frmh;
uint16_t tmp;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3838,7 +3838,7 @@ static int pic32mx_wakeup(struct usbdev_s *dev)
struct pic32mx_usbdev_s *priv = (struct pic32mx_usbdev_s *)dev;
usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3862,7 +3862,7 @@ static int pic32mx_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -4373,7 +4373,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup)
{
@@ -4439,7 +4439,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (driver != priv->driver)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig
index ac412b6dc52..6a66969184b 100644
--- a/arch/mips/src/pic32mz/Kconfig
+++ b/arch/mips/src/pic32mz/Kconfig
@@ -332,11 +332,11 @@ config PIC32MZ_SPI_ENHBUF
config PIC32MZ_SPI_REGDEBUG
bool "SPI Register level debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Output detailed register-level SPI device debug information.
- Requires also DEBUG.
+ Requires also CONFIG_DEBUG_FEATURES.
endmenu # SPI Driver Configuration
@@ -400,9 +400,9 @@ config NET_WOL
config NET_REGDEBUG
bool "Register level debug"
default n
- depends on PIC32MZ_ETHERNET && DEBUG
+ depends on PIC32MZ_ETHERNET && DEBUG_FEATURES
---help---
- Enabled low level register debug. Also needs DEBUG.
+ Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES.
config NET_HASH
bool "Hash"
@@ -425,8 +425,8 @@ menu "Device Configuration 0 (DEVCFG0)"
config PIC32MZ_DEBUGGER_ENABLE
bool "Background debugger enable"
- default y if DEBUG
- default n if !DEBUG
+ default y if DEBUG_FEATURES
+ default n if !DEBUG_FEATURES
---help---
Background Debugger Enable
@@ -444,8 +444,8 @@ config PIC32MZ_ICESEL_CH2
config PIC32MZ_TRACE_ENABLE
bool "Trace enable"
- default y if DEBUG
- default n if !DEBUG
+ default y if DEBUG_FEATURES
+ default n if !DEBUG_FEATURES
---help---
Trace Enable
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 4118fc7567a..2d60888a371 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -141,11 +141,11 @@
#define PIC32MZ_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1)
/* Debug Configuration *****************************************************/
-/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG is selected.
+/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected.
* This will probably generate much more output than you care to see.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_REGDEBUG
# undef CONFIG_NET_DESCDEBUG
#endif
@@ -154,7 +154,7 @@
* console.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_DUMPPACKET
#endif
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index 1c1a0b85123..a370ca4c4bc 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -85,7 +85,7 @@
uint32_t *pic32mz_exception(uint32_t *regs)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t cause;
uint32_t epc;
#endif
@@ -96,7 +96,7 @@ uint32_t *pic32mz_exception(uint32_t *regs)
board_autoled_on(LED_INIRQ);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Get the cause of the exception from the CAUSE register */
asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c
index ae46628585f..a8707ca1070 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpio.c
+++ b/arch/mips/src/pic32mz/pic32mz-gpio.c
@@ -307,7 +307,7 @@ bool pic32mz_gpioread(pinset_t pinset)
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
void pic32mz_dumpgpio(uint32_t pinset, const char *msg)
{
unsigned int port = pic32mz_portno(pinset);
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index 6845ff50352..0679bf95ff3 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -752,7 +752,7 @@ static int up_interrupt(struct uart_dev_s *dev)
* - Overflow condition for the receive buffer OERR (UxSTA bit 1) occurs
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (up_pending_irq(priv->irqe))
{
/* Clear the pending error interrupt */
@@ -1008,7 +1008,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
*/
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_enable_irq(priv->irqe);
#endif
up_enable_irq(priv->irqrx);
@@ -1017,7 +1017,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
}
else
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
up_disable_irq(priv->irqe);
#endif
up_disable_irq(priv->irqrx);
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index 2a51031c45a..47879c3240b 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -147,7 +147,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
void up_assert(const uint8_t *filename, int lineno)
{
-#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG)
+#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG_FEATURES)
struct tcb_s *rtcb = this_task();
#endif
diff --git a/arch/sh/src/common/up_createstack.c b/arch/sh/src/common/up_createstack.c
index f52f03386ed..da202683285 100644
--- a/arch/sh/src/common/up_createstack.c
+++ b/arch/sh/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index 84845556e98..c2c41763c87 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -75,7 +75,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -149,7 +149,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 98c6bf273d8..579b15fe7f6 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -77,7 +77,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index 640564d0943..4e29d7127cb 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/sh/src/m16c/m16c_head.S b/arch/sh/src/m16c/m16c_head.S
index f18da3fe3fe..711ce26aaaf 100644
--- a/arch/sh/src/m16c/m16c_head.S
+++ b/arch/sh/src/m16c/m16c_head.S
@@ -58,7 +58,7 @@
*****************************************************************************/
.macro showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.globl _up_lowputc
mov.b r#\code1l /* Character to print */
jsr.a _up_lowputc /* Print it */
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index 289745aaf03..ed5edee4275 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/sh/src/sh1/sh1_head.S b/arch/sh/src/sh1/sh1_head.S
index 9bb4efb1f5e..e46522da885 100644
--- a/arch/sh/src/sh1/sh1_head.S
+++ b/arch/sh/src/sh1/sh1_head.S
@@ -67,7 +67,7 @@
#ifdef CONFIG_ARCH_LEDS
.globl _board_autoled_initialize /* Boot LED setup */
#endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.globl _up_lowputc /* Low-level debug output */
#endif
.globl _os_start /* NuttX entry point */
@@ -161,7 +161,7 @@
*****************************************************************************/
.macro showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov.l .Llowputc, r0 /* Address of up_earlyconsoleinit */
jsr @r0 /* Call it */
mov #\code, r4 /* Delay slot */
@@ -488,7 +488,7 @@ __start0:
#endif
.Llowsetup:
.long _up_lowsetup
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
.Llowputc:
.long _up_lowputc
#endif
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c
index 58514a25744..3a0651efd47 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/sh/src/sh1/sh1_irq.c
@@ -92,7 +92,7 @@ void up_prioritize_irq(int irq, int priority)
uint32_t reg;
int shift;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15)
{
dbg("Invalid parameters\n");
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index d3dc5a54b12..592c4a7cb26 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -105,7 +105,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 517081af9d2..4bab7d5fd07 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -63,7 +63,7 @@
/* Debug ****************************************************************************/
/* Check if (non-standard) SPI debug is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 4a577053f2c..50399557578 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
@@ -80,12 +80,12 @@
* code. We are going to print the task name if:
*
* CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name
- * (defined(CONFIG_DEBUG) || <-- And the debug is enabled (lldbg used)
+ * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
* defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
*/
#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
# define CONFIG_PRINT_TASKNAME 1
#endif
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 12779df0248..a776bd5b1b5 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -74,7 +74,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -148,7 +148,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", this_task());
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
slldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 07697ea078c..502aca23382 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -71,7 +71,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/x86/src/i486/up_createstack.c b/arch/x86/src/i486/up_createstack.c
index 1d9b1008d09..61992d27407 100644
--- a/arch/x86/src/i486/up_createstack.c
+++ b/arch/x86/src/i486/up_createstack.c
@@ -139,7 +139,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c
index 69924f5141d..dbf0599dda8 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/x86/src/qemu/qemu_fullcontextrestore.S b/arch/x86/src/qemu/qemu_fullcontextrestore.S
index 97a208ad893..bc55160e3a9 100644
--- a/arch/x86/src/qemu/qemu_fullcontextrestore.S
+++ b/arch/x86/src/qemu/qemu_fullcontextrestore.S
@@ -58,7 +58,7 @@
/* Trace macros, use like trace 'i' to print char to serial port. */
.macro chout, addr, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov $\addr, %dx
mov $\ch, %al
out %al, %dx
@@ -66,7 +66,7 @@
.endm
.macro trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
push %eax
push %edx
chout 0x3f8, \ch
diff --git a/arch/x86/src/qemu/qemu_head.S b/arch/x86/src/qemu/qemu_head.S
index 82b8d37a8d7..2b205208b3e 100644
--- a/arch/x86/src/qemu/qemu_head.S
+++ b/arch/x86/src/qemu/qemu_head.S
@@ -64,7 +64,7 @@
/* Trace macros, use like trace 'i' to print char to serial port. */
.macro trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov $0x3f8, %dx
mov $\ch, %al
out %al, %dx
diff --git a/arch/x86/src/qemu/qemu_saveusercontext.S b/arch/x86/src/qemu/qemu_saveusercontext.S
index 5b4b78647bc..0620bbf6582 100644
--- a/arch/x86/src/qemu/qemu_saveusercontext.S
+++ b/arch/x86/src/qemu/qemu_saveusercontext.S
@@ -54,7 +54,7 @@
/* Trace macros, use like trace 'i' to print char to serial port. */
.macro chout, addr, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
mov $\addr, %dx
mov $\ch, %al
out %al, %dx
@@ -62,7 +62,7 @@
.endm
.macro trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
push %eax
push %edx
chout 0x3f8, \ch
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index dc06d022f67..bcefc234ae7 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/z16/src/common/up_createstack.c b/arch/z16/src/common/up_createstack.c
index c4d55370408..db9296dd1c6 100644
--- a/arch/z16/src/common/up_createstack.c
+++ b/arch/z16/src/common/up_createstack.c
@@ -120,7 +120,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index 7c238b24997..bb98e7f3573 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -67,7 +67,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -141,7 +141,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", tcb);
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
lldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 50b287d08a6..c7fc43bfbc1 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -82,7 +82,7 @@ volatile FAR chipreg_t *g_current_regs;
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index a100010c1c2..76cdff2481b 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index b6f5c66ad24..9f95debe31d 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/z16/src/z16f/Kconfig b/arch/z16/src/z16f/Kconfig
index 8861726aee3..56067cae663 100644
--- a/arch/z16/src/z16f/Kconfig
+++ b/arch/z16/src/z16f/Kconfig
@@ -33,7 +33,7 @@ menu "Z16F ESPI Configuration"
config Z16F_ESPI_REGDEBUG
bool "ESPI register-level debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
endmenu # Z16F ESPI Configuration
endif # ARCH_CHIP_Z16F
diff --git a/arch/z16/src/z16f/z16f_clkinit.c b/arch/z16/src/z16f/z16f_clkinit.c
index 15371646bc5..883a5d84076 100644
--- a/arch/z16/src/z16f/z16f_clkinit.c
+++ b/arch/z16/src/z16f/z16f_clkinit.c
@@ -59,7 +59,7 @@ extern _Erom unsigned long SYS_CLK_FREQ;
* Private Functions
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* System clock initialization--DEBUG. Code Using Frequency Input from
* ZDS IDE.
@@ -206,7 +206,7 @@ static void z16f_sysclkinit(int clockid, uint32_t frequency)
for (count = 0; count < 10000; count++);
}
-#else /* CONFIG_DEBUG */
+#else /* CONFIG_DEBUG_FEATURES */
/****************************************************************************
* System Clock Initialization Recommended for Release Code
*
@@ -247,7 +247,7 @@ static void z16f_sysclkinit(int clockid, uint32_t frequency)
putreg8(0xe0 | 1, Z16F_OSC_CTL); /* Use the external osc/clock as system clock */
}
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
/****************************************************************************
* Public Functions
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index d20c71a756e..af357444a95 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -63,7 +63,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_Z16F_ESPI_REGDEBUG
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index 222d7180700..a7b47339343 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -44,9 +44,9 @@
*/
#ifdef CONFIG_ARCH_STACKDUMP
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_INFO 1
#endif
diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/up_createstack.c
index 60c4733d99e..b38a0b9a619 100644
--- a/arch/z80/src/common/up_createstack.c
+++ b/arch/z80/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Was the allocation successful? */
if (!tcb->stack_alloc_ptr)
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index 82f647c18c9..45efedd881e 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -77,7 +77,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
{
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -151,7 +151,7 @@ void _exit(int status)
slldbg("TCB=%p exiting\n", tcb);
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
lldbg("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 218a7823266..17a1c037a91 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -70,7 +70,7 @@
*
****************************************************************************/
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
static void up_calibratedelay(void)
{
int i;
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index 1de5a0b004f..b9a1bf15086 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 364ebfa95ef..308f8231b28 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -244,7 +244,7 @@
/* EMAC statistics (debug only) */
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET)
struct ez80mac_statistics_s
{
uint32_t rx_int; /* Number of Rx interrupts received */
@@ -321,7 +321,7 @@ struct ez80emac_driver_s
WDOG_ID txpoll; /* TX poll timer */
WDOG_ID txtimeout; /* TX timeout timer */
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET)
struct ez80mac_statistics_s stat;
#endif
@@ -574,7 +574,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
/* Verify that the detect PHY is an AMD Am87c874 as expected */
-#ifdef CONFIG_DEBUG /* Parameter checking only done when DEBUG is enabled */
+#ifdef CONFIG_DEBUG_FEATURES /* Parameter checking only done when DEBUG is enabled */
phyval = ez80emac_miiread(priv, MII_PHYID1);
if (phyval != MII_PHYID1_AM79C874)
{
diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c
index f1c8a2bcd1a..d9bec997c29 100644
--- a/arch/z80/src/ez80/ez80_i2c.c
+++ b/arch/z80/src/ez80/ez80_i2c.c
@@ -399,7 +399,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
*/
sr = ez80_i2c_waitiflg();
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (sr != I2C_SR_MSTART)
{
/* This error should never occur */
@@ -469,7 +469,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
/* We don't attempt any fancy status-based error recovery */
failure:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
switch (sr)
{
case I2C_SR_ARBLOST1: /* Arbitration lost in address or data byte */
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index f5bbf0dedca..c6025165d33 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index a2f1c4c535d..0e3b9d07be8 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -446,7 +446,7 @@ FAR struct spi_dev_s *ez80_spibus_initialize(int port)
/* Only the SPI1 interface is supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (port != 1)
{
return NULL;
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index 8c78148cd35..bf8713d6a29 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index c5bfd8251e1..f85273d27f0 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index 0f6a701379f..eaea63c7b4b 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -41,9 +41,9 @@
/* Output debug info -- even if debug is not selected. */
-#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_FEATURES
#undef CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
#define CONFIG_DEBUG_INFO 1
#include
diff --git a/binfmt/binfmt.h b/binfmt/binfmt.h
index 370ef57eaeb..cfde554d4e4 100644
--- a/binfmt/binfmt.h
+++ b/binfmt/binfmt.h
@@ -86,7 +86,7 @@ EXTERN FAR struct binfmt_s *g_binfmts;
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
int dump_module(FAR const struct binary_s *bin);
#else
# define dump_module(bin)
diff --git a/binfmt/binfmt_dumpmodule.c b/binfmt/binfmt_dumpmodule.c
index c69fed83c43..d4b534ce9cc 100644
--- a/binfmt/binfmt_dumpmodule.c
+++ b/binfmt/binfmt_dumpmodule.c
@@ -47,7 +47,7 @@
#include "binfmt.h"
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
/****************************************************************************
* Pre-processor Definitions
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 03b10c89abd..3afe49042e3 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -147,7 +147,7 @@ int exec_module(FAR const struct binary_s *binp)
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!binp || !binp->entrypt || binp->stacksize <= 0)
{
err = EINVAL;
diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c
index 3e73a01fb6a..c8b319f685b 100644
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@@ -180,7 +180,7 @@ int load_module(FAR struct binary_s *bin)
/* Verify that we were provided something to work with */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (bin && bin->filename)
#endif
{
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 92f8b9b9e04..ab08515dd9f 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
@@ -87,7 +87,7 @@
****************************************************************************/
static int elf_loadbinary(FAR struct binary_s *binp);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo);
#endif
@@ -110,7 +110,7 @@ static struct binfmt_s g_elfbinfmt =
* Name: elf_dumploadinfo
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo)
{
int i;
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 1c416fa660e..684eaba8bef 100644
--- a/binfmt/libelf/Kconfig
+++ b/binfmt/libelf/Kconfig
@@ -35,7 +35,7 @@ config ELF_BUFFERINCR
config ELF_DUMPBUFFER
bool "Dump ELF buffers"
default n
- depends on DEBUG && CONFIG_DEBUG_INFO
+ depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
---help---
Dump various ELF buffers for debug purposes
diff --git a/binfmt/libelf/libelf_bind.c b/binfmt/libelf/libelf_bind.c
index 7d63fa87a3a..009e17c7df5 100644
--- a/binfmt/libelf/libelf_bind.c
+++ b/binfmt/libelf/libelf_bind.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index fdbe328d601..9efa1e4b2c1 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
diff --git a/binfmt/libnxflat/Kconfig b/binfmt/libnxflat/Kconfig
index c5f920695de..6929b04296c 100644
--- a/binfmt/libnxflat/Kconfig
+++ b/binfmt/libnxflat/Kconfig
@@ -6,4 +6,4 @@
config NXFLAT_DUMPBUFFER
bool "Dump NXFLAT buffers"
default n
- depends on DEBUG && CONFIG_DEBUG_INFO
+ depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index 25f251685de..42395171530 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c
index af8fd102d22..826614f2d9e 100644
--- a/binfmt/libnxflat/libnxflat_init.c
+++ b/binfmt/libnxflat/libnxflat_init.c
@@ -54,7 +54,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
diff --git a/binfmt/libpcode/Kconfig b/binfmt/libpcode/Kconfig
index 6005657b6b0..c767aca7907 100644
--- a/binfmt/libpcode/Kconfig
+++ b/binfmt/libpcode/Kconfig
@@ -64,6 +64,6 @@ endif # PCODE_TEST_FS
config PCODE_DUMPBUFFER
bool "Dump P-code buffers"
default n
- depends on DEBUG && CONFIG_DEBUG_INFO
+ depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
---help---
Dump various P-code buffers for debug purposes
diff --git a/binfmt/libpcode/README.txt b/binfmt/libpcode/README.txt
index 4c06a5c075a..d6cb606af77 100644
--- a/binfmt/libpcode/README.txt
+++ b/binfmt/libpcode/README.txt
@@ -96,7 +96,7 @@ Here is a simple test configuration using the NuttX simulator:
Debug options can also be enabled with:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_BINFMT=y
CONFIG_DEBUG_INFO=y
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index d2df7c1d111..1e2eddf3a22 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
@@ -79,7 +79,7 @@
****************************************************************************/
static int nxflat_loadbinary(struct binary_s *binp);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo);
#endif
@@ -102,7 +102,7 @@ static struct binfmt_s g_nxflatbinfmt =
* Name: nxflat_dumploadinfo
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo)
{
unsigned long dsize = loadinfo->datasize + loadinfo->bsssize;
diff --git a/configs/README.txt b/configs/README.txt
index 45f06d0fa0e..3e44ef649c5 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -123,7 +123,7 @@ Make.defs -- This makefile fragment provides architecture and
Definitions in the Make.defs file probably depend on some of the
settings in the .config file. For example, the CFLAGS will most likely be
- different if CONFIG_DEBUG=y.
+ different if CONFIG_DEBUG_FEATURES=y.
The included tools/Config.mk file contains additional definitions that may
be overriden in the architecture-specific Make.defs file as necessary:
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 5c62c54f886..f7862235e30 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt
index 3d3a6e09033..e886b558898 100644
--- a/configs/arduino-due/README.txt
+++ b/configs/arduino-due/README.txt
@@ -1072,8 +1072,8 @@ Configuration sub-directories
debug output on USART0 can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
STATUS:
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 51cf6e0923d..ed94d781749 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index 9708b777fa6..b84f34f1a57 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -95,7 +95,7 @@
* at approximately 2Hz, then a fatal error has been detected and the system
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index eecc9fae4e9..4279a4ab1e1 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/arduino-mega2560/hello/defconfig b/configs/arduino-mega2560/hello/defconfig
index 4459053ee1b..d710f55debb 100644
--- a/configs/arduino-mega2560/hello/defconfig
+++ b/configs/arduino-mega2560/hello/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/arduino-mega2560/nsh/defconfig b/configs/arduino-mega2560/nsh/defconfig
index 9aee289d6d7..d9eca795de8 100644
--- a/configs/arduino-mega2560/nsh/defconfig
+++ b/configs/arduino-mega2560/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 0f87f200461..a0846beb460 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 6fc2eed59f4..1342e4c2e7c 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/c5471evm/httpd/Make.defs b/configs/c5471evm/httpd/Make.defs
index 9f465df52ca..aa491bb2bc7 100644
--- a/configs/c5471evm/httpd/Make.defs
+++ b/configs/c5471evm/httpd/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 895892b2462..5f0118087a3 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RRLOAD_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/c5471evm/nettest/Make.defs b/configs/c5471evm/nettest/Make.defs
index 909f21b0830..0cd136c400e 100644
--- a/configs/c5471evm/nettest/Make.defs
+++ b/configs/c5471evm/nettest/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 006c9b09b0e..ba47f3e2669 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RRLOAD_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/c5471evm/nsh/Make.defs b/configs/c5471evm/nsh/Make.defs
index 41fa4b2f25a..9e22f8ef31c 100644
--- a/configs/c5471evm/nsh/Make.defs
+++ b/configs/c5471evm/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 3ca99d5e61f..90dba4e681f 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RRLOAD_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index 68c1a21f1c5..df8dc6ecb96 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index 6155f845507..f3cded9e76a 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -87,7 +87,7 @@
* LED_PANIC 4 ON OFF OFF (flashing 2Hz)
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/cloudctrl/README.txt b/configs/cloudctrl/README.txt
index f98996d214a..853c2e6e9ed 100644
--- a/configs/cloudctrl/README.txt
+++ b/configs/cloudctrl/README.txt
@@ -651,7 +651,7 @@ Cloudctrl-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
Cloudctrl LCD Hardware Configuration
@@ -708,9 +708,9 @@ Cloudctrl-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 40bd30e1a11..2b6591e0ebc 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index 9e1f0000786..ef237c06524 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index dadb3fa8be9..d1eba035c15 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -58,9 +58,9 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index e7bc159243d..79316352acb 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index e521e8e7daf..29d7ceb2879 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 85ad3ce661b..66ca0db0ea5 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e99/nsh_compalram/Make.defs b/configs/compal_e99/nsh_compalram/Make.defs
index 9fe718fb893..2920fb27d69 100644
--- a/configs/compal_e99/nsh_compalram/Make.defs
+++ b/configs/compal_e99/nsh_compalram/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index e3107fc8470..77d140a6fe5 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e99/nsh_highram/Make.defs b/configs/compal_e99/nsh_highram/Make.defs
index a7164120e0c..28c0f00c54a 100644
--- a/configs/compal_e99/nsh_highram/Make.defs
+++ b/configs/compal_e99/nsh_highram/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index a7cbecbe981..3f18883c1d1 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index b5f8ba3a5d6..dc2009b5d20 100644
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index 56c0df885f0..a5b357b803d 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -50,7 +50,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index 3d029f14eab..329609850df 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -54,7 +54,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index 7bc8f6f8257..fc1e30d8165 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 28ca9aa4ca4..a2d60ace10c 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 6b5dbe5d0bc..35122c8bf53 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define ssidbg lldbg
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index 7d894ede63e..6d708ad1cc3 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 847486498eb..7db317ab9fe 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 68215a41b38..e56fb71d68c 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -48,7 +48,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 91bad2c867c..51c57f06a9c 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -199,7 +199,7 @@ struct pg_source_s
/* This the device geometry */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
FAR struct mtd_geometry_s geo;
#endif
};
@@ -289,7 +289,7 @@ static inline void lpc31_initsrc(void)
static inline void lpc31_initsrc(void)
{
FAR struct spi_dev_s *spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t capacity;
int ret;
#endif
@@ -318,7 +318,7 @@ static inline void lpc31_initsrc(void)
/* Verify that we can use the device */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Get the device geometry. (casting to uintptr_t first eliminates
* complaints on some architectures where the sizeof long is different
* from the size of a pointer).
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 3b509575c38..396f014bd9f 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index fead5400553..2a71d33c276 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index e7a88724c9d..6d68bedc94f 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 598fabeb5ab..49dda7cc91a 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index b964927c370..09cb59c000e 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -199,7 +199,7 @@ struct pg_source_s
/* This the device geometry */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
FAR struct mtd_geometry_s geo;
#endif
};
@@ -289,7 +289,7 @@ static inline void lpc31_initsrc(void)
static inline void lpc31_initsrc(void)
{
FAR struct spi_dev_s *spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
uint32_t capacity;
int ret;
#endif
@@ -318,7 +318,7 @@ static inline void lpc31_initsrc(void)
/* Verify that we can use the device */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Get the device geometry. (casting to uintptr_t first eliminates
* complaints on some architectures where the sizeof long is different
* from the size of a pointer).
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index 429c87abcd3..7810e06e1e3 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 68153a06554..6347edf502d 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 96e0b09524e..b7920a1123b 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index bd692c7ffa9..3488e2b471b 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 77837598c15..96471a6dcfa 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 67b18010a40..364634f48e7 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -43,7 +43,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index 9cd7ef8325e..53282481ad0 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index 87b347b0d19..09cfcb44518 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSI_DEBUG /* Define to enable debug */
#undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 9bd0ee452b5..ae3c7d6e275 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index a3112c194cb..d99809600d1 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index 54a4df6f3d2..d1d73ada950 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index 556556454f3..ce42e08b69d 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index d8d3ea37a76..d78466e83cf 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index 6fb6fb00aeb..598f7c04b8c 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -93,7 +93,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index ab25dda6a87..093a151f971 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -70,7 +70,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 946038cb057..c4c1ca9db1f 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index a70dd50dc2a..7abff4bbcc9 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index c8cd2a16d72..bef242e500e 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSI_DEBUG /* Define to enable debug */
#undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 6beb0a6b783..5ad96bd9153 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index a2b16e66503..19f54e3feb8 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index ca49dec32a4..c34eb7aff51 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index ca3b61d97ef..9e0180deaf1 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index f365f264a66..f431c18dad1 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index afc307df76c..ca969eee985 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/fire-stm32v2/README.txt b/configs/fire-stm32v2/README.txt
index 3af6249e505..d8da5f1f341 100644
--- a/configs/fire-stm32v2/README.txt
+++ b/configs/fire-stm32v2/README.txt
@@ -758,7 +758,7 @@ M3 Wildfire-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
M3 Wildfire LCD Hardware Configuration
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index a914c0624aa..72a8e7e4a1a 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index c64c9f2f59c..e70905831fa 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index 541f79ed848..6f2bcb41773 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index 7092d02577a..f4968c29749 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 753da383ba1..c2ccfaf0a66 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 7a97b9a5bb5..285f30c8b38 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index 7480fab4386..c5fe8d3831c 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 7b5562c94b8..0a41ea33717 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/freedom-kl26z/minnsh/defconfig b/configs/freedom-kl26z/minnsh/defconfig
index 843bd482e05..b21dd2b7102 100644
--- a/configs/freedom-kl26z/minnsh/defconfig
+++ b/configs/freedom-kl26z/minnsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index 40157e1b53b..af85a35e635 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index bc42e95e467..a6bc7f048f7 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index c54e51d5d1e..2c7151a7b40 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index 98d8c23e23c..4c7a5f6be73 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -502,7 +502,7 @@ HY-Mini specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
HY-MiniSTM32V LCD Hardware Configuration. The HY-Mini board may be delivered with
@@ -702,10 +702,10 @@ Where is one of the following:
USB debug output can be enabled as by changing the following
settings in the configuration file:
- -CONFIG_DEBUG=n
+ -CONFIG_DEBUG_FEATURES=n
-CONFIG_DEBUG_INFO=n
-CONFIG_DEBUG_USB=n
- +CONFIG_DEBUG=y
+ +CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_USB=y
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 3141e0c1605..bc42209cf81 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 69662e887c4..d572218f049 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index e36492fc6aa..4e191fbbbf2 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index 19b6158e85c..4b1b1e46847 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index 5e9d4c5748b..2150e1833fe 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#define SPI_DEBUG /* Define to enable debug */
#define SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index 2aa36b2ab18..264be5d9003 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -69,7 +69,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index a38efa7b82f..a84c37fb42b 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index d744b1a2ca9..200447a70d3 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 6183ec98d4f..aefb46b0480 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 51b5c56a7a4..60166ea794c 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 57d275ab219..ee458ef185a 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -47,7 +47,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 2a80ab00249..710e9e56b2e 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index 082be95f2bd..cae356b118c 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index e99f81bcfae..a92cf59ebb1 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -93,7 +93,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt
index 1bea5b5bfb0..b5320549c01 100644
--- a/configs/lincoln60/README.txt
+++ b/configs/lincoln60/README.txt
@@ -386,9 +386,9 @@ Lincoln 60 Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index c48f2977868..38c6cb0587d 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 54c6ad3f8cc..609322785bf 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index 27b46bfbc04..5b8ab879517 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig
index a752c4c72ff..1cbd3aeb336 100644
--- a/configs/lincoln60/thttpd-binfs/defconfig
+++ b/configs/lincoln60/thttpd-binfs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 0d4695c79b7..618b1a5be18 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index 5ee88cc12b7..dc97dbe1809 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 7df29e56ad3..4b7ddac4e87 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSI_DEBUG /* Define to enable debug */
#undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 3a31755617a..1ede54c185d 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 3a31755617a..1ede54c185d 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 3d779630f9d..0753cc248fa 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 2ff29036b13..1f38fe65aee 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index db662fd1a16..f289c65badb 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -63,7 +63,7 @@
* Verbose debug must also be enabled
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 256d3a54823..9e18cbe60e5 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSI_DEBUG /* Define to enable debug */
#undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index e655d4d6c13..d4282f16fb1 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 57c304ce134..067dad9f116 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index c72dc447b56..ab03e9edc65 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index d7d6c3cd57b..0274ddc1fd2 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 42871d17b3f..74e5cd91646 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -62,7 +62,7 @@
* Verbose debug must also be enabled
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index 1149704dc8f..a0a32472aca 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSI_DEBUG /* Define to enable debug */
#undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 61ff3481e35..d87cc7cf0dc 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 89684e1c24c..0fcb45ffa8a 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -97,7 +97,7 @@
* LED_PANIC 4 ON OFF OFF (flashing 2Hz)
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index e23385e207d..0acbe8f4d1d 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define ssidbg lldbg
diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt
index 93f71509e7f..3afbe967ff0 100644
--- a/configs/lpc4330-xplorer/README.txt
+++ b/configs/lpc4330-xplorer/README.txt
@@ -362,14 +362,14 @@ Code Red IDE/Tools
in debugging symbols.
NOTE 3: There are few things that NuttX has to do differently if you
- are using a debugger. Make sure that you also set CONFIG_DEBUG=y. Nothing
+ are using a debugger. Make sure that you also set CONFIG_DEBUG_FEATURES=y. Nothing
also is needed and no debug output will be generated; but NuttX will
- use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+ use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
with certain resets and debug controls appropriately.
So you should have:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -817,9 +817,9 @@ LPC4330-Xplorer Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
LPC43xx USB Device Configuration
@@ -928,7 +928,7 @@ Where is one of the following:
from the SPI address space after each write.
CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers. You
probably do not want to enable this unless you want to dig through a
- *lot* of debug output! Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ *lot* of debug output! Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
and CONFIG_DEBUG_FS,
5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index a6a461ba6c9..13c015c5c41 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_ARCH_STDARG_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index 85a537e3d60..2d67cde4756 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -90,7 +90,7 @@
*/
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index d296cdf2755..0de6d63063a 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -67,7 +67,7 @@
*/
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpc4337-ws/README.txt b/configs/lpc4337-ws/README.txt
index 25dec3aad40..a62558a8a08 100644
--- a/configs/lpc4337-ws/README.txt
+++ b/configs/lpc4337-ws/README.txt
@@ -358,14 +358,14 @@ Code Red IDE/Tools
in debugging symbols.
NOTE 3: There are few things that NuttX has to do differently if you
- are using a debugger. Make sure that you also set CONFIG_DEBUG=y. Nothing
+ are using a debugger. Make sure that you also set CONFIG_DEBUG_FEATURES=y. Nothing
also is needed and no debug output will be generated; but NuttX will
- use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+ use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
with certain resets and debug controls appropriately.
So you should have:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -856,9 +856,9 @@ LPC4337-ws Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
LPC43xx USB Device Configuration
@@ -967,7 +967,7 @@ Where is one of the following:
from the SPI address space after each write.
CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers. You
probably do not want to enable this unless you want to dig through a
- *lot* of debug output! Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ *lot* of debug output! Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
and CONFIG_DEBUG_FS,
5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index 4f36719c26f..11e1e3062f5 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_STDARG_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4357-evb/README.txt b/configs/lpc4357-evb/README.txt
index f60934d6bd7..c3febbec039 100644
--- a/configs/lpc4357-evb/README.txt
+++ b/configs/lpc4357-evb/README.txt
@@ -355,14 +355,14 @@ Code Red IDE/Tools
in debugging symbols.
NOTE 3: There are few things that NuttX has to do differently if you
- are using a debugger. Make sure that you also set CONFIG_DEBUG=y. Nothing
+ are using a debugger. Make sure that you also set CONFIG_DEBUG_FEATURES=y. Nothing
also is needed and no debug output will be generated; but NuttX will
- use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+ use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
with certain resets and debug controls appropriately.
So you should have:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -853,9 +853,9 @@ LPC4357-EVB Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
LPC43xx USB Device Configuration
@@ -964,7 +964,7 @@ Where is one of the following:
from the SPI address space after each write.
CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers. You
probably do not want to enable this unless you want to dig through a
- *lot* of debug output! Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ *lot* of debug output! Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
and CONFIG_DEBUG_FS,
5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index e1f25c97d57..37601e039c0 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_ARCH_STDARG_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index 1ff5dc954be..31589a84dae 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -87,7 +87,7 @@
*/
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index e7d4f672a00..29086a86d0d 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -78,7 +78,7 @@
*/
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpc4370-link2/README.txt b/configs/lpc4370-link2/README.txt
index 492e8c4abc1..9280b3258bd 100644
--- a/configs/lpc4370-link2/README.txt
+++ b/configs/lpc4370-link2/README.txt
@@ -358,14 +358,14 @@ Code Red IDE/Tools
in debugging symbols.
NOTE 3: There are few things that NuttX has to do differently if you
- are using a debugger. Make sure that you also set CONFIG_DEBUG=y. Nothing
+ are using a debugger. Make sure that you also set CONFIG_DEBUG_FEATURES=y. Nothing
also is needed and no debug output will be generated; but NuttX will
- use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+ use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
with certain resets and debug controls appropriately.
So you should have:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -856,9 +856,9 @@ LPC4370-Link2 Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
LPC43xx USB Device Configuration
@@ -967,7 +967,7 @@ Where is one of the following:
from the SPI address space after each write.
CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers. You
probably do not want to enable this unless you want to dig through a
- *lot* of debug output! Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ *lot* of debug output! Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
and CONFIG_DEBUG_FS,
5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 8a14cef0675..82d3fdea904 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_STDARG_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index 147a18316f2..8e9edbf141e 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index 1469e52ed60..294bf480782 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -60,7 +60,7 @@
/* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpcxpresso-lpc1115/minnsh/defconfig b/configs/lpcxpresso-lpc1115/minnsh/defconfig
index 58ea587ca6b..4b7a2748e95 100644
--- a/configs/lpcxpresso-lpc1115/minnsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/minnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index fc7f470f6da..17f1bfde042 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index 0c1abf192c1..06bb3e57c5a 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index 0cc48e117a7..08847387ca9 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSP_DEBUG /* Define to enable debug */
#undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt
index 4d00330a141..36d5eead96f 100644
--- a/configs/lpcxpresso-lpc1768/README.txt
+++ b/configs/lpcxpresso-lpc1768/README.txt
@@ -676,9 +676,9 @@ LPCXpresso Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index aca1a2a69b5..9e7037cf026 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index e5151fc9614..e548bd2b89c 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index e604f2997f8..2473e7e4b33 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index d454e1db75e..cd18e6846ef 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index c61b67fb4b9..5610c90c9cd 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -75,7 +75,7 @@
* Verbose debug must also be enabled
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 632200a77f6..f3239e42a85 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSP_DEBUG /* Define to enable debug */
#undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 69b2148fdfc..e203df5654c 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index a6d2fa0c3da..fe6c95bf21c 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 54ebb6d22ea..fd555b7de2c 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index b60f26e071e..686663cfa82 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index 567b5d5a568..13b7ba2c620 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -73,7 +73,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index e372dca1d80..22f1d4e55a4 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 90df022c7f1..9100c5632a2 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -59,9 +59,9 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index fe4466fd045..58380687fa0 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt
index 8385d563f5d..734ff3883db 100644
--- a/configs/mbed/README.txt
+++ b/configs/mbed/README.txt
@@ -349,9 +349,9 @@ mbed Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index ef889a04118..aec81d64449 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -37,7 +37,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index dcfda7b8c9b..6596091fc86 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index 2262ac0de79..c303cc33b91 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/mcu123-lpc214x/composite/Make.defs b/configs/mcu123-lpc214x/composite/Make.defs
index a1d22707cc3..8d1cd5305ea 100644
--- a/configs/mcu123-lpc214x/composite/Make.defs
+++ b/configs/mcu123-lpc214x/composite/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 73d1c5912dc..eda130109f5 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/nsh/Make.defs b/configs/mcu123-lpc214x/nsh/Make.defs
index 35984af465b..e7f4792f8a0 100644
--- a/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/configs/mcu123-lpc214x/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 4d7bbb44e84..ef656130501 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index aeddd22b977..3c1b5eca6e9 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -548,7 +548,7 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
/* Only the SPI1 interface is supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (port != 1)
{
return NULL;
diff --git a/configs/mcu123-lpc214x/usbmsc/Make.defs b/configs/mcu123-lpc214x/usbmsc/Make.defs
index 09495f17e27..cbdb32871ac 100644
--- a/configs/mcu123-lpc214x/usbmsc/Make.defs
+++ b/configs/mcu123-lpc214x/usbmsc/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 5d58f0bba79..3fba717eafc 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs
index 54c6f3ffe48..5e6d6aa799a 100644
--- a/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index e13970db02d..4c01c08a481 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index a1a6f7ceeca..b843bb70a70 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt
index e71797ffb12..59522039a40 100644
--- a/configs/mikroe-stm32f4/README.txt
+++ b/configs/mikroe-stm32f4/README.txt
@@ -660,7 +660,7 @@ Mikroe-STM32F4-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
Mikroe-STM32F4 SPI Configuration
@@ -703,9 +703,9 @@ Mikroe-STM32F4-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 60e6ec45842..d2855b82194 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 53c51bc66f8..541bf36f6d2 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -47,7 +47,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index ddff8824cb2..b70544ce971 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index e0bd19efdd3..f15e9f29d5f 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 61f68f82d86..6d6e72883b6 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 06e3ab7ab25..efe5b4720f4 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 9cb05cddb43..9abd9ebe04d 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -73,7 +73,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index e6336e3145f..c007e5aebe1 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -74,7 +74,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index 6c445f2c82e..e35b332c6ae 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -63,7 +63,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index aff176b9df7..af0fd609fbd 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 1925e947cf0..faf80c044b3 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 876d762db04..5a9b691c1b6 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 65622c8bac1..99b3f8195ba 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -93,7 +93,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 23f7578ff48..bd3446a1d8d 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -92,7 +92,7 @@
#define GPIO_PGA117_CS (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTB|GPIO_PIN7)
#define GPIO_SST25VF032B_CS (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTB|GPIO_PIN13)
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_DEBUG_SPI - Define to enable basic SPI debug
*/
diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig
index 92218c71f21..c2cf278267b 100644
--- a/configs/moteino-mega/hello/defconfig
+++ b/configs/moteino-mega/hello/defconfig
@@ -40,7 +40,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig
index 3625027ae26..36156b8a292 100644
--- a/configs/moteino-mega/nsh/defconfig
+++ b/configs/moteino-mega/nsh/defconfig
@@ -40,7 +40,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 526f57c9002..3770e8e927c 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index ff3598cad69..a46d5327131 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 0740d2a158b..b9442ef16f4 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index f13118e5803..52e1afd874d 100644
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index 7871ecbb60e..e35663b0750 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -53,7 +53,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
* CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index 9fa059af1f0..414b243000a 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -52,7 +52,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index b76b8509b9b..4e69581a865 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -54,7 +54,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 9b287554506..d5e1e4c25c9 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 3d30d84415e..253a848408c 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 82d918604f1..19312449ba2 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 55c20c37906..189372f25ac 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 906bc57eabd..976f7018242 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index 7173e675610..0c1575922bf 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index 4c63ce773c0..06fc415c041 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index b8bcde84fec..68451cbb1b7 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index e4165fa20d3..5e15aafa6b1 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index 8e7fae13a42..d939a39556e 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index 74334025a76..5003ea43846 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -54,7 +54,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index 98d8020f63e..1794a2845b9 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig
index 4a26a328f99..c7f0d633787 100644
--- a/configs/nucleo-f303re/adc/defconfig
+++ b/configs/nucleo-f303re/adc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig
index 3fe7a7e6ffd..3a3c06931ae 100644
--- a/configs/nucleo-f303re/can/defconfig
+++ b/configs/nucleo-f303re/can/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig
index 6ea676faa0e..868dff9a652 100644
--- a/configs/nucleo-f303re/nxlines/defconfig
+++ b/configs/nucleo-f303re/nxlines/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig
index 08973aff2a7..e794d3b47c4 100644
--- a/configs/nucleo-f303re/pwm/defconfig
+++ b/configs/nucleo-f303re/pwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig
index 2203ccbe87e..760b77e3479 100644
--- a/configs/nucleo-f303re/serialrx/defconfig
+++ b/configs/nucleo-f303re/serialrx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index ef1b3cdb07c..098fe245635 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index d9bb2000b9b..28f44035184 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index f7bc8dff30a..bda0055d120 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-f303re/uavcan/defconfig b/configs/nucleo-f303re/uavcan/defconfig
index c68b048740a..6473097cf39 100644
--- a/configs/nucleo-f303re/uavcan/defconfig
+++ b/configs/nucleo-f303re/uavcan/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index bdacfd5723e..164422be804 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index 1192acfa94b..5f353390328 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index cfec1f4e6e4..20882df3453 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index b2f268afbc9..91a3fcfc568 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -61,7 +61,7 @@
/* Enables debug output from this file */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#endif
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index 7aaa9954c5b..ad45a693909 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index 4f58d7b1aef..40d1757a023 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_DEBUG_INFO=y
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index af2a75424df..667fd024a0b 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index b86dd6091a3..a98a19c9634 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -61,7 +61,7 @@
/* Enables debug output from this file */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#endif
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index fab0f27850d..0521655dc4d 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 9c73cbc043c..25df02b98de 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index bb797e8ce27..712fec27c5a 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -76,7 +76,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index 99b47aac95b..2437444121d 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index f3463176647..84f2cbd171b 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index ac0659ab42a..6817a1d3f33 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index d6649225430..f8a13297c00 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt
index 7739e8dc0e2..9e88edd8771 100644
--- a/configs/olimex-lpc1766stk/README.txt
+++ b/configs/olimex-lpc1766stk/README.txt
@@ -773,9 +773,9 @@ Olimex LPC1766-STK Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
@@ -929,7 +929,7 @@ Configuration Sub-Directories
2. You may also want to define the following in your configuration file.
Otherwise, you will have not feedback about what is going on:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FTPC=y
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 612214ee670..b6d71ebeb14 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 995016cfd6e..56b10fb30f9 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index f4e746ef762..8a34f1b45a2 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index d9b56621523..3ea457fd886 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 5de7c1a619c..73b936fecaa 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 34b2d4c3f07..897a1b3dd4a 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index bf9a212683f..a965a598b06 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 3b2299f9609..7861edf614a 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -79,7 +79,7 @@
* Verbose debug must also be enabled
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index 1fce6e0512e..7299f508fce 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index 5fe86c7f05b..db562cc9847 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -74,7 +74,7 @@
#endif
/* Debug ********************************************************************/
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_SSP_DEBUG - Define to enable basic SSP debug
* CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
index da3dca2d7e3..d3cdafdb9d9 100644
--- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
index ae4b8bfd3e2..505ddb9bdb5 100644
--- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index f499036204d..35d7141e1a1 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 28806b7c2b2..8a2e409f588 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 5150356081b..093cef7b7a1 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc2378/nsh/Make.defs b/configs/olimex-lpc2378/nsh/Make.defs
index d5c026545c4..e623ef3b858 100644
--- a/configs/olimex-lpc2378/nsh/Make.defs
+++ b/configs/olimex-lpc2378/nsh/Make.defs
@@ -76,7 +76,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -120,7 +120,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 207ae574d59..2670bc4dc06 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index 5a928b269fc..8003b796213 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index f1ab8ed2839..00bb661f4ed 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -52,7 +52,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index 5ba6d946fc5..33a729cbde8 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index 808193295bd..17aafd0c0b5 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index 67d5a75497b..6f19d4a630c 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index 02719fb94e3..a4dd9aa31f7 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 5d921f8c5c4..5f103a6e7e8 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index 372cd504504..b45af597358 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 645352677cc..3ccfd8bfee1 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index 291759f60bd..334b123e1ce 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index ba1f3d8cc78..b11a5765084 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -52,7 +52,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimex-strp711/nettest/Make.defs b/configs/olimex-strp711/nettest/Make.defs
index ca1550a6edd..67f4f77d671 100644
--- a/configs/olimex-strp711/nettest/Make.defs
+++ b/configs/olimex-strp711/nettest/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 2f698cc8bdc..07d292a7a9e 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-strp711/nsh/Make.defs b/configs/olimex-strp711/nsh/Make.defs
index 268e6039ebd..d2750fb667f 100644
--- a/configs/olimex-strp711/nsh/Make.defs
+++ b/configs/olimex-strp711/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 790273c4220..b6454a797fc 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index 866967575ef..284fc55b6d3 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index bb7055ac686..4db6ca49fb5 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index bff7b461199..a5d78472372 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index 1429b4c2b49..efcbbe0a484 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index ff823e52629..f51b89e165e 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -54,7 +54,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 99b404326d5..e71ab183c04 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index 4fe4bb5a901..6a8fbe3cf60 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
CONFIG_STACK_COLORATION=y
diff --git a/configs/open1788/README.txt b/configs/open1788/README.txt
index 4e2fae623f2..8edd78ab132 100644
--- a/configs/open1788/README.txt
+++ b/configs/open1788/README.txt
@@ -438,8 +438,8 @@ CONFIGURATION
debug output can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
c) You will also have to disable SD card support to use this test. The
@@ -463,7 +463,7 @@ CONFIGURATION
For touchscreen debug output:
Build Setup:
- CONFIG_DEBUG=y
+ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_INPUT=y
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 566df000ae0..b28e4e87bf9 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 82a8f975de5..00a7dd67111 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 486cc41cb0f..22e10f17cda 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -37,7 +37,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index 3f16d5cd065..30b44682a64 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -134,7 +134,7 @@
#define LED_IDLE_OFF_SETBITS ((OPEN1788_LED4) << OFF_SETBITS_SHIFT)
#define LED_IDLE_OFF_CLRBITS ((0) << OFF_CLRBITS_SHIFT)
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index b7f1ca5d5b1..2f75e678476 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index 4e2ebbff083..12359147a4d 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/pcblogic-pic32mx/README.txt b/configs/pcblogic-pic32mx/README.txt
index d6e5176a5ca..c98882584b8 100644
--- a/configs/pcblogic-pic32mx/README.txt
+++ b/configs/pcblogic-pic32mx/README.txt
@@ -626,8 +626,8 @@ Configuration sub-directories
To enable LCD debug output:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable LCD debug
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable LCD debug
NOTES:
a. I do not have the LCD1602 working. I may just be getting lost in the
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 7a3de04abac..3585765cbef 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index 517bfee6a97..43027711d5d 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -106,7 +106,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 95833160ff6..0d5c40af7a7 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index ee13572a7a5..69b00d196b7 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -90,7 +90,7 @@
* application if CONFIG_ARCH_LEDS is not defined.
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/pic32mx-starterkit/README.txt b/configs/pic32mx-starterkit/README.txt
index f89cf146634..196efadda95 100644
--- a/configs/pic32mx-starterkit/README.txt
+++ b/configs/pic32mx-starterkit/README.txt
@@ -991,9 +991,9 @@ PIC32MX specific PHY/Ethernet device driver settings
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index f337701d2ec..9d95806d46d 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index 99d95697952..168b1157b54 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index 07480043b5d..705de956ad9 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -97,7 +97,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 234f740d9e3..4b18174c1cd 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_SPI_DEBUG - Define to enable basic SPI debug
* CONFIG_SPI_VERBOSE - Define to enable verbose SPI debug
diff --git a/configs/pic32mx7mmb/README.txt b/configs/pic32mx7mmb/README.txt
index 641f1590244..29fb0acbc1f 100644
--- a/configs/pic32mx7mmb/README.txt
+++ b/configs/pic32mx7mmb/README.txt
@@ -569,9 +569,9 @@ PIC32MX specific PHY/Ethernet device driver settings
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 13adb9973c8..fd10897fb83 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index c329b3a3794..88cbbd164a5 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -100,7 +100,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
index 11b156e5f8d..d083041692b 100644
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -73,7 +73,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index 84a5db8b166..1768e5ddd60 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -75,7 +75,7 @@
#define GPIO_SD_WP (GPIO_INPUT|GPIO_PORTG|GPIO_PIN6)
#define GPIO_SD_CD (GPIO_INPUT|GPIO_INT|GPIO_PORTG|GPIO_PIN7)
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_DEBUG_SPI - Define to enable basic SPI debug
*/
diff --git a/configs/pic32mz-starterkit/nsh/Make.defs b/configs/pic32mz-starterkit/nsh/Make.defs
index 83d48045e88..ab082145f31 100644
--- a/configs/pic32mz-starterkit/nsh/Make.defs
+++ b/configs/pic32mz-starterkit/nsh/Make.defs
@@ -103,7 +103,7 @@ ARCHWARNINGSXX = -Wall -Wshadow -Wundef
ARCHDEFINES =
ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_XC32),y)
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
ARCHCFLAGS += -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist
endif
endif
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 4948a286e67..3662e48eeb2 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index f8aa219476c..db41f994209 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -93,7 +93,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index a2bfc39e514..57849364c37 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -73,7 +73,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index d8eac38010b..ad786886a86 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index c07faea1dac..7f88c5286b0 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_HOST_LINUX=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 9306bec0db8..9ada6498abf 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -39,7 +39,7 @@ CONFIG_HOST_LINUX=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index 4b1bf3a25ca..8495938b1b7 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index acbb59be363..90f20031956 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 6823fb176e7..d9ba51f827d 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 6f10a9ed0e4..5d6cb9c5f0c 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index c3491a89ae4..bc8d365d29d 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index ff56c8ecf83..7bd35b1c0d6 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/sabre-6quad/README.txt b/configs/sabre-6quad/README.txt
index 8835b84b4ff..965d2d908e4 100644
--- a/configs/sabre-6quad/README.txt
+++ b/configs/sabre-6quad/README.txt
@@ -79,7 +79,7 @@ Status
configuration that I used for testing. I enabled DEBUG output, ran with
only 2 CPUS, and disabled the RAMLOG:
- +CONFIG_DEBUG=y
+ +CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_SCHED=y
+CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index 25b14c99ff4..5d95de0c179 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index 2cd36db1274..5e8afbadb13 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 65c45ef2cd6..487f3d69cba 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -82,7 +82,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt
index 75fa2f8e3a7..c4dadfe8097 100644
--- a/configs/sam3u-ek/README.txt
+++ b/configs/sam3u-ek/README.txt
@@ -624,8 +624,8 @@ Configurations
debug output on UART0 can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
3. Enabling HSMCI support. The SAM3U-KE provides a an SD memory card
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index e7e5b4d898b..9a56064aa0f 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_NUTTX_USERSPACE=0x00090000
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 028d86b604a..0f23cf44ca3 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 5a1d8b24660..f8f9a7ffe84 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 407a4e34d5c..da3c51728a4 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index 4aa0e28d224..467d199eb8e 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -142,7 +142,7 @@
/* Verbose debug must also be enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LED
#endif
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index 8d702f5f20c..e2cc82a99f9 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index 39fb1da0618..1b7768057e6 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt
index 63d2afa21aa..41694bc2750 100644
--- a/configs/sam4e-ek/README.txt
+++ b/configs/sam4e-ek/README.txt
@@ -815,7 +815,7 @@ USB Full-Speed Device
--------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB device operation is very
time critical and enabling this debug output WILL interfere with the
operation of the UDP. USB device tracing is a less invasive way to get
debug information: If tracing is enabled, the USB device will save
@@ -943,9 +943,9 @@ Touchscreen
debug output on UART0 can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
- CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
STATUS: Verified 2014-05-14
@@ -1439,8 +1439,8 @@ Configurations
debug output on UART0 can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
10. This configuration can be re-configured to test the on-board LCD
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 9790e30919f..e6d405873f8 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig
index c5e1de7a6b8..2ef7b2a98f7 100644
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c
index 1aee4173ae6..a589d40ab2c 100644
--- a/configs/sam4e-ek/src/sam_ili9325.c
+++ b/configs/sam4e-ek/src/sam_ili9325.c
@@ -201,7 +201,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index 48d755e43b9..26aa2949456 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -202,7 +202,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index 747428abacf..329ff4078d2 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -98,7 +98,7 @@
#define D4_ON (LED_ON << D4_SHIFT)
#define D4_NOCHANGE (LED_NOCHANGE << D4_SHIFT)
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index 42e92ac9179..e94fbd63080 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 09a19f5aea3..80736c4caab 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 223ce701c65..60170ad2aa3 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index 91d59db7e58..1a695ca3d30 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c
index 844d438821f..9b53b14724c 100644
--- a/configs/sam4l-xplained/src/sam_slcd.c
+++ b/configs/sam4l-xplained/src/sam_slcd.c
@@ -85,7 +85,7 @@
# error CONFIG_SAM34_RC32K be selected in the board configuration
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 1c74d8e9f85..9135e6dfb49 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -54,7 +54,7 @@
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index 8e5ab2e699d..d3849f67681 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index d5008bd41a2..e796be0db2a 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index aabf3fca5ef..22b6688d0ec 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -74,7 +74,7 @@
* LED_IDLE MCU is is sleep mode Not used
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index 06a5ae8668c..a6e9fc7854a 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -102,7 +102,7 @@
* timer
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_TIMER
#endif
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index aa67cc33a10..e7b604e5290 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index e0f845e337a..f9ebfb46c65 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -85,7 +85,7 @@
/* Debug ***************************************************************************/
/* Non-standard debug that may be enabled just for testing the watchdog timer */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_WATCHDOG
#endif
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 583fa8d9269..18055fb1196 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index fd1a2a448a8..289b3e01dd3 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -73,7 +73,7 @@
* LED_IDLE MCU is is sleep mode Not used
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index e501a0db3e9..bd1411c800f 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index 537cb8d4ea1..dcd38abd685 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index 4336f047fd7..f7875f73a08 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -89,7 +89,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index bc29bcb7b60..03299f8d402 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -65,7 +65,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt
index 93cfb9a6c2e..336008da1eb 100644
--- a/configs/sama5d3-xplained/README.txt
+++ b/configs/sama5d3-xplained/README.txt
@@ -1356,7 +1356,7 @@ USB High-Speed Device
--------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB device operation is very
time critical and enabling this debug output WILL interfere with the
operation of the UDPHS. USB device tracing is a less invasive way to get
debug information: If tracing is enabled, the USB device will save
@@ -1550,7 +1550,7 @@ file1: CONFIG_USBHOST_ISOC_DISABLE=y
------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB host operation is very time
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB host operation is very time
critical and enabling this debug output might interfere with the operation
of the UDPHS. USB host tracing is a less invasive way to get debug
information: If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index 59d6feb7a20..21cbf729dec 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 9e517d9edb5..b096817b15e 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index 208761c25cc..468f74c33c6 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -91,7 +91,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 903f8b93aa5..588e24a8342 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index c8464c6ad07..3b31c71813d 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 82a5c2fd4cc..f6601d26533 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1534,7 +1534,7 @@ USB High-Speed Device
--------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB device operation is very
time critical and enabling this debug output WILL interfere with the
operation of the UDPHS. USB device tracing is a less invasive way to get
debug information: If tracing is enabled, the USB device will save
@@ -1718,7 +1718,7 @@ USB High-Speed Host
------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB host operation is very time
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB host operation is very time
critical and enabling this debug output might interfere with the operation
of the UDPHS. USB host tracing is a less invasive way to get debug
information: If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 6805bd04ab0..a25290cbec5 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index 0be49453e11..e1677b94440 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 56b211c95f5..f6888c8649c 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 78c20734934..cd3c6e0256a 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 7a4734bead8..5bd9fd49e17 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 7a1878be00b..51feda7a001 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index bc5e3694ac1..11e9a854417 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index c058dd759b8..1529474d0a4 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 6859ff07723..03932ae8790 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -91,7 +91,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index 2ffa429913a..ef1c1d0b874 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index d98ef8955a0..4b623515ac1 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -67,7 +67,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index 7e3f33bd3bb..2120739e5b3 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -1910,7 +1910,7 @@ USB High-Speed Device
--------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB device operation is very
time critical and enabling this debug output WILL interfere with the
operation of the UDPHS. USB device tracing is a less invasive way to get
debug information: If tracing is enabled, the USB device will save
@@ -2102,7 +2102,7 @@ USB High-Speed Host
------------------
There is normal console debug output available that can be enabled with
- CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB host operation is very time
+ CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB. However, USB host operation is very time
critical and enabling this debug output might interfere with the operation
of the UDPHS. USB host tracing is a less invasive way to get debug
information: If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 64151008f58..cd7c46ca7bc 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index e777febe93b..b90ca57f517 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index f12701c0c51..9d8209403d2 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index b598b3f7cc9..5e871507ae8 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -47,7 +47,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index 4a1d810af90..ba5f8eaa162 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 1992f4004bc..87b85e3ae60 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index a069c2d2a7d..eeb8acc422f 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index cf1cd2d601e..d8ef00a4d50 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 0144af933e8..814542201dc 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 4490b66233c..a8bb0dc5f77 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 773800694dd..41184e4a170 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -96,7 +96,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index c0efcfa1ce9..9d62139275a 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index 04bcc1a260f..eab759d679e 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -71,7 +71,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 5df5b16c4d0..87edc245bfb 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index ff0b699ba26..eb032116e9d 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index d6fb6d63290..6417b980b61 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index fe9157aea73..ca90196d01b 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 1610bf7397e..83cfab46246 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index b1ce7f52365..bb06a515d7c 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index d4ad01a64f9..b44bf35b472 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index 78aa6e6d0bf..b424805f75c 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/same70-xplained/README.txt b/configs/same70-xplained/README.txt
index e35fb67a8b9..b4e882a5f6d 100644
--- a/configs/same70-xplained/README.txt
+++ b/configs/same70-xplained/README.txt
@@ -745,8 +745,8 @@ MCAN1 Loopback Test
Enabling CAN Debug Output
-------------------------
Build Setup -> Debug Options
- CONFIG_DEBUG=y # Enables general debug features
- CONFIG_DEBUG_INFO=y # Enables verbose output
+ CONFIG_DEBUG_FEATURES=y # Enables general debug features
+ CONFIG_DEBUG_INFO=y # Enables verbose output
CONFIG_DEBUG_CAN=y # Enables debug output from CAN
CONFIG_STACK_COLORATION=y # Monitor stack usage
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index 6fbb830a236..80e6323f2d4 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index 07e012f98ee..0a77aaefd59 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index 005c93bb3d8..9a68e179cd6 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index 7357f3a6fda..d1a090e3325 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index c44ddac15aa..0501ee95b44 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 80b43043a45..6a3f4a8505e 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index 2fd0c0923df..da3e2d67ecc 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index 35b4fdc0999..a21714d9b86 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt
index 014627e8318..c3626d085fc 100644
--- a/configs/samv71-xult/README.txt
+++ b/configs/samv71-xult/README.txt
@@ -1335,8 +1335,8 @@ MCAN1 Loopback Test
Enabling CAN Debug Output
-------------------------
Build Setup -> Debug Options
- CONFIG_DEBUG=y # Enables general debug features
- CONFIG_DEBUG_INFO=y # Enables verbose output
+ CONFIG_DEBUG_FEATURES=y # Enables general debug features
+ CONFIG_DEBUG_INFO=y # Enables verbose output
CONFIG_DEBUG_CAN=y # Enables debug output from CAN
CONFIG_STACK_COLORATION=y # Monitor stack usage
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index de6d5d57f67..6339428989f 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -51,7 +51,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index b55a4699a4c..1d484f8f603 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index 2186d42ddf7..3909c4bb409 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 98334e64370..28f69354aca 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 235b9afd19f..66eef8cec94 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index cae079b2d78..f4315ad71ad 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index 3381fe8cc6f..d302980a649 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -97,7 +97,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index 14e12ca6909..ed9dd1d5b72 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -207,7 +207,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index 0edc2f45a2f..82172a60410 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index d13af25cab7..6e472ce90b2 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index 9f7df955c9f..30c3346129d 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt
index f310f2f7b71..cff8b23595c 100644
--- a/configs/shenzhou/README.txt
+++ b/configs/shenzhou/README.txt
@@ -668,7 +668,7 @@ Shenzhou-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
Shenzhou LCD Hardware Configuration
@@ -725,9 +725,9 @@ Shenzhou-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 468531b33a7..6d7451accf2 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index ccb8ecf3ab7..cd4f922de24 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index 4d521f68e27..9e22924ed71 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index e92b29042f4..41fef5868b9 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -206,7 +206,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index 6992fc3835d..e83eb0c62fc 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -57,9 +57,9 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index 221e0821eca..868449ee003 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -71,7 +71,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index 3cf360d7fb6..66b9de9ea64 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index c7dc38f611f..f59e2704af4 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/sim/bas/defconfig b/configs/sim/bas/defconfig
index a20524034a8..263a99090e6 100644
--- a/configs/sim/bas/defconfig
+++ b/configs/sim/bas/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index a22c644dca0..f4233e53604 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 62e60cc71c4..6c81c365be4 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -41,7 +41,7 @@ CONFIG_ARCH_FLOAT_H=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index a45d341ba67..05e0718ce7c 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index a56157ed008..a91df0a3d2b 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index 32196dd8b98..4eb9ea87808 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index d5a3b826519..da4d1d71408 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 7fecde9a3d5..48223bb14a8 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 4ff288e4844..ea53866275f 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index e3f3c92817d..5d816932c73 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 2b5f953a89a..05d2ac83cb2 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 167222da6c9..2f17fed0b85 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index b31cb37fa47..c2c38d6215a 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -45,7 +45,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 1c872a87925..3baa4ef65dc 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 113dc3f6222..62666d3d3aa 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 2fed08f743c..1ffde388e08 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 98d29376a94..3cb463d85c8 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index ac0a5d398fc..b9854ec3f27 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig
index 8a1b8ce8a65..5db261aa15f 100644
--- a/configs/sim/udgram/defconfig
+++ b/configs/sim/udgram/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/unionfs/defconfig b/configs/sim/unionfs/defconfig
index 5646c7bccde..f634b8bf10d 100644
--- a/configs/sim/unionfs/defconfig
+++ b/configs/sim/unionfs/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig
index 237e32d66fa..53879abb9fd 100644
--- a/configs/sim/ustream/defconfig
+++ b/configs/sim/ustream/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index da7c48a09d5..afa72d9af41 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index bb01a161b57..c0713e16b1b 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 6f2a5f631ab..a18bcd21cbf 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index 8ccf2f3141d..c39b53d3121 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index bdbb5b229af..a74a434d37f 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -63,7 +63,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index 995feb06f39..db66130c713 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index cb4040ef822..8e945a51d2d 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 4d3c51a5ffa..0069b99f042 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index aba09edc985..dcc83462a09 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 6570d4e8da3..9fedf98effe 100644
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -657,7 +657,7 @@ STM3210E-EVAL-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM3210E-EVAL LCD Hardware Configuration
@@ -1064,10 +1064,10 @@ Where is one of the following:
USB debug output can be enabled as by changing the following
settings in the configuration file:
- -CONFIG_DEBUG=n
+ -CONFIG_DEBUG_FEATURES=n
-CONFIG_DEBUG_INFO=n
-CONFIG_DEBUG_USB=n
- +CONFIG_DEBUG=y
+ +CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_USB=y
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 11783f56529..9760c7596ad 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index d4664da4222..42564278212 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index bc1df0013a4..3e4babf3c4e 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index f2a22b3f389..6495ae0b4f0 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 2554b724aac..4eab3a9dedc 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index 4a19b0a255c..da99ecd650f 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 4acbe0d3a7e..570954ff632 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index b6aab706395..a0b4062d3be 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -161,7 +161,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index 99d86cf97fb..fd61c85ce98 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index 934137ee57e..efa7305b611 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 001c83e4f56..8548824a957 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 4e6b606f275..7a54c3a789c 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt
index c30383cbdfd..d1ceddaca49 100644
--- a/configs/stm3220g-eval/README.txt
+++ b/configs/stm3220g-eval/README.txt
@@ -486,7 +486,7 @@ Configuration Options:
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
FSMC SRAM
@@ -817,7 +817,7 @@ STM3220G-EVAL-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM3220G-EVAL LCD Hardware Configuration
@@ -842,9 +842,9 @@ STM3220G-EVAL-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 1a09df8349a..25432aea872 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 59d9ac24fad..bd6d76b0327 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 2d730e87079..55eb89cda4e 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 94a88d9a224..99b7a1f652b 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 9ba451d2030..10dd97c8c92 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index 02d3ff18af5..d2d428d8680 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index 3ea0d3dcd4f..392c4f39907 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -113,7 +113,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index ba00efe80d2..ca42244f987 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index 3eda42599af..301ea4bdda2 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 2e65dced627..456ec61e190 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt
index e6dfe3cf53b..560ee32e0bd 100644
--- a/configs/stm3240g-eval/README.txt
+++ b/configs/stm3240g-eval/README.txt
@@ -382,7 +382,7 @@ Configuration Options:
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
FPU
@@ -810,7 +810,7 @@ STM3240G-EVAL-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM3240G-EVAL LCD Hardware Configuration
@@ -877,9 +877,9 @@ STM3240G-EVAL-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index e78e7312170..8aede9c9e36 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 6e6116857e0..a6556e8be1d 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 9d2baf17c6d..895218c6f40 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -51,7 +51,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index d8f93001ea3..7ff0a9859f3 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index fa7c9c4e385..e11d8b48ad1 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index d839e77cb2c..f413fb97d98 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index ddc8ede129e..c50998d6989 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index a4f272fb43c..cfc9df8f9b2 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index a20e979628f..fbfffffec1c 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index 89e7bd508c2..9ac96ce3b5a 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -113,7 +113,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index 04ec6d37f68..3d77a12175c 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index dd3d70ea52b..303eebdc81c 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index b2cc945bdd4..6d37c628d55 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 22e9eae028b..d624ed0102f 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 010bb5d881c..ef3897d0fcf 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32_tiny/README.txt b/configs/stm32_tiny/README.txt
index 1909b9dac8b..2e1bc8a2941 100644
--- a/configs/stm32_tiny/README.txt
+++ b/configs/stm32_tiny/README.txt
@@ -493,7 +493,7 @@ STM32 Tiny - specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32Tiny SPI Configuration
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 488ebd637b0..9314ce10dab 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index 21329e76e95..54767e6b5b6 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index a5867cd70a9..6ecb45feb81 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -58,9 +58,9 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index 18a9cdab677..dee2bffc0ca 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/README.txt b/configs/stm32f103-minimum/README.txt
index 4f8ff5849fb..800ce32c47f 100644
--- a/configs/stm32f103-minimum/README.txt
+++ b/configs/stm32f103-minimum/README.txt
@@ -392,7 +392,7 @@ STM32F103 Minimum - specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F103 Minimum SPI Configuration
diff --git a/configs/stm32f103-minimum/minnsh/defconfig b/configs/stm32f103-minimum/minnsh/defconfig
index 16568484f0b..f82d32cdaab 100644
--- a/configs/stm32f103-minimum/minnsh/defconfig
+++ b/configs/stm32f103-minimum/minnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index c489f2182c9..6a74e8d4db0 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 5be7c7c8855..3ab744afd39 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 6781b25ed85..88664512191 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -58,9 +58,9 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index 84579e2f49f..b1804dc70b4 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt
index 4c5a16c803e..cf20d388364 100644
--- a/configs/stm32f3discovery/README.txt
+++ b/configs/stm32f3discovery/README.txt
@@ -637,7 +637,7 @@ STM32F3Discovery-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F3Discovery SPI Configuration
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 9c48a2059a9..ea746def107 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index f62159c1566..7b74fdbeaf5 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index 2a9f8e1464c..8a5b992773f 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index 1dbe43d7623..89eb1e64929 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index ed5e23a9d98..1b60a529e12 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index e9719959a96..16f23c50485 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/README.txt b/configs/stm32f429i-disco/README.txt
index 1a1960a0d24..215a837e459 100644
--- a/configs/stm32f429i-disco/README.txt
+++ b/configs/stm32f429i-disco/README.txt
@@ -533,7 +533,7 @@ STM32F429I-DISCO-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F429I-DISCO SPI Configuration
@@ -576,9 +576,9 @@ STM32F429I-DISCO-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index e277a69d2ab..ca991936890 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index 7d399bb3996..bc0a882e2c4 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index 7adb9cc1d50..ce2a6655cde 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 37e776417d6..c54c4bd5b69 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index 6c417c9856b..1f110120770 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index f0d4890eec1..97d2de76cae 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -60,7 +60,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 11513057f85..60176c905b7 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 802ff5915b9..5f34604f72d 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 0a9deac0461..2189ee2ebfc 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index a5ce946ad76..101607188b6 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1024,7 +1024,7 @@ STM32F4Discovery-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F4Discovery SPI Configuration
@@ -1067,9 +1067,9 @@ STM32F4Discovery-specific Configuration Options
CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
BASIC
=====
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 7a4a6262adb..df571f322af 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -46,7 +46,7 @@ CONFIG_ARCH_FLOAT_H=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index d31cbd08ca0..82c8b86c0a6 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index 07b3a1fc08d..9cf8c1ee699 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index c3f18548776..00e1ff529f0 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -51,7 +51,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index 1edd9ec625e..5a83e7bdbdd 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index e57c9fd05e3..7a8b1a8b58f 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 284eef1c4cf..fccdcbc179c 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index f9444cbdbeb..383a96f6444 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 2eaef404731..3e58869dd11 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index 0c7ace6f01a..737163cc467 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index 70888d40a3e..36255cb24e2 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 62713692ef2..846db5a8e8c 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c
index dbb1642ec2c..90a27bd91e9 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1289.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1289.c
@@ -76,7 +76,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index 1359e816891..fbfa7c5b16e 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f4discovery/uavcan/defconfig b/configs/stm32f4discovery/uavcan/defconfig
index 97db93590ef..de306262859 100644
--- a/configs/stm32f4discovery/uavcan/defconfig
+++ b/configs/stm32f4discovery/uavcan/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 66134476b76..16c569baf46 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 079f197c1ff..fa2cc94cab5 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt
index eff9a803536..e1a9c2783da 100644
--- a/configs/stm32f746g-disco/README.txt
+++ b/configs/stm32f746g-disco/README.txt
@@ -416,7 +416,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32F7_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F746G-DISCO SPI Configuration
@@ -459,9 +459,9 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_STM32F7_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever
want to do that?
CONFIG_STM32F7_USBHOST_REGDEBUG - Enable very low-level register access
- debug. Depends on CONFIG_DEBUG.
+ debug. Depends on CONFIG_DEBUG_FEATURES.
CONFIG_STM32F7_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- packets. Depends on CONFIG_DEBUG.
+ packets. Depends on CONFIG_DEBUG_FEATURES.
Configurations
==============
diff --git a/configs/stm32f746g-disco/knsh/defconfig b/configs/stm32f746g-disco/knsh/defconfig
index 6edc370a236..0d53e8c3f6d 100644
--- a/configs/stm32f746g-disco/knsh/defconfig
+++ b/configs/stm32f746g-disco/knsh/defconfig
@@ -51,7 +51,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig
index 5fe8fa019da..ba5526141ba 100644
--- a/configs/stm32f746g-disco/netnsh/defconfig
+++ b/configs/stm32f746g-disco/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index fdac7f8dd68..564d647ad2c 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 5cb07a6939e..59db81ec162 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -53,7 +53,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index 5107c789003..e59ba516937 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -51,7 +51,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index b903233d87e..bb35e16b4d5 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index 4114e983a5f..fe532436410 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index ed1d224c7b3..186f0f8f386 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -61,7 +61,7 @@
/* Enables debug output from this file */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#endif
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index da3d0a389c3..eafb33b6d41 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32ldiscovery/README.txt b/configs/stm32ldiscovery/README.txt
index 5b957dcf473..ed8a1b2c7ad 100644
--- a/configs/stm32ldiscovery/README.txt
+++ b/configs/stm32ldiscovery/README.txt
@@ -707,7 +707,7 @@ STM32L-Discovery-specific Configuration Options
CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined.
CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
- CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+ CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32L-Discovery SPI Configuration
@@ -813,8 +813,8 @@ Configuration sub-directories
CONFIG_LCD=y : (Needed to enable LCD debug)
Build Setup -> Debug Options:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable LCD debug
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable LCD debug
NOTE: At this point in time, testing of the SLCD is very limited because
there is not much in apps/examples/slcd. Certainly there are more bugs
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index d497e5e5d92..ae2c63ff12f 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index d59ffbea7d0..b903cb81a13 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -73,7 +73,7 @@
* LED_IDLE STM32 is is sleep mode Not used
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c
index e90f9b018b5..cdab603a5fc 100644
--- a/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -84,7 +84,7 @@
# error "This SLCD driver requires CONFIG_LIB_SLCDCODEC"
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index deb88a03393..e0a0638c70e 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 8ba7f81ecdd..3e2fa4dbe94 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/stm32vldiscovery/README.txt b/configs/stm32vldiscovery/README.txt
index 28986df04dd..963a85ff7cf 100644
--- a/configs/stm32vldiscovery/README.txt
+++ b/configs/stm32vldiscovery/README.txt
@@ -342,7 +342,7 @@ RX pin (PA10) of your board besides, of course, the GND pin.
CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
- CONFIG_ARCH_CALIBRATION - when used togeter with CONFIG_DEBUG enables some
+ CONFIG_ARCH_CALIBRATION - when used togeter with CONFIG_DEBUG_FEATURES enables some
build in instrumentation that cause a 100 second delay during boot-up.
This 100 second delay serves no purpose other than it allows you to
calibratre CONFIG_ARCH_LOOPSPERMSEC. You simply use a stop watch to
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index d1911fb9616..36cbe839703 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index e4392c1c937..9c0a052e5cb 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index ea79c4b20ef..0f59eccba3c 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -735,13 +735,13 @@ Where is one of the following:
File Systems:
CONFIG_FS_FAT=y : FAT file system
- : Other FAT options
+ : Other FAT options
Debug output for testing the SD card can be enabled using:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_FS=y : Enable file system debug
CONFIG_DEBUG_SPI=y : Enable SPI debug
@@ -772,7 +772,7 @@ Where is one of the following:
To enable LCD debug output:
Build Setup -> Debug Options:
- CONFIG_DEBUG=y : Enable debug features
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_LCD=y : Enable LCD debug output
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 25e91c17f2e..586054fd480 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index f03ebd1f094..7c9ef99b001 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -88,7 +88,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
index 7c6480505cf..ad6eefc52a6 100644
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -113,7 +113,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index 28207c49ef0..6e2a0fa3d78 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -120,11 +120,11 @@
/* The following enable debug output from this file.
*
- * CONFIG_DEBUG_SPI && CONFIG_DEBUG - Define to enable basic SPI debug
+ * CONFIG_DEBUG_SPI && CONFIG_DEBUG_FEATURES - Define to enable basic SPI debug
* CONFIG_DEBUG_INFO - Define to enable verbose SPI debug
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#endif
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 572454b95ab..cf8c9003bd1 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/teensy-2.0/hello/defconfig b/configs/teensy-2.0/hello/defconfig
index 423049ad667..7b0cb5f914f 100644
--- a/configs/teensy-2.0/hello/defconfig
+++ b/configs/teensy-2.0/hello/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index eaf3e24cc9e..be4d9acb2df 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index 19aa4eb5a9c..a1927221239 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index 015ace6b4de..cd67ae6ac2f 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -80,7 +80,7 @@
#define TEENSY_CD (1 << 4)
#define TEENSY_WP (1 << 5)
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_SPI_DEBUG - Define to enable basic SSP debug
* CONFIG_SPI_VERBOSE - Define to enable verbose SSP debug
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index b185f2467c6..99f4422eca2 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index 2b5dfa6aecb..b1c743c446e 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index 8e3c3fb222e..d220304539f 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index 1e750e8e6fd..28941b695d8 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index 500557d15dc..6473aa8b658 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_DEBUG_INFO=y
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index 783df86163d..daf26ed5c2a 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 2dcb86c62c5..111900225ec 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -55,7 +55,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 454af5b842f..2b6387edeea 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 918de86f7d6..f2cbb2ab615 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -97,7 +97,7 @@
* LED_PANIC 4 ON OFF OFF (flashing 2Hz)
*/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 52c049f984c..2cf79f11f96 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -59,7 +59,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define ssidbg lldbg
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index 95080731f66..0e28f5a84d5 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index 00bf8e7e7c2..683294364a3 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index d5c79ef522b..6e8d287652c 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -67,7 +67,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index ac65d4c0257..87448694e11 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index 5e7cc58e65b..a7130f7e629 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -119,7 +119,7 @@
#define LED_PANIC_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT)
#define LED_PANIC_OFF_CLRBITS ((K60_LED4) << OFF_CLRBITS_SHIFT)
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 2e08636ce6b..8f7b8145f43 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 73f0d2fcf3e..2e9d8ebe10c 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index 0b141fe6c88..f7299b1c66d 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index 2655f043be2..85d58d5564f 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SSP_DEBUG /* Define to enable debug */
#undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index b6ec91adbca..0061bd3fca8 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index d6d492cda59..db51c2dba8a 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -97,7 +97,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
# ifdef CONFIG_DEBUG_INFO
# define ledinfo lldbg
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index e18cd49cc8c..df2d6ced1d3 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 7490f982d79..c5e816c47af 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index a07182756d1..e84f13aec01 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -766,8 +766,8 @@ Configurations
debug output on USART1 can be enabled with:
Build Setup:
- CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_INFO=y : Enable verbose debug output
+ CONFIG_DEBUG_FEATURES=y : Enable debug features
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
STATUS: Working
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 0fcfc13a51b..0fd667d8dbf 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 13098391893..678c3c0d85f 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index eac5f7d9147..a3c40e589ad 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
CONFIG_ARCH_HAVE_HEAPCHECK=y
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index 49cac845237..fa65507488e 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -53,7 +53,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* with CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 398416010b1..3b957acc52a 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -57,7 +57,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#undef SPI_DEBUG /* Define to enable debug */
#undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index 69fe2590a06..b3e135191d7 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -68,7 +68,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index fed3d18a034..b9eb07b695e 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index d0f9abadd0d..e7a9ae6755a 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index eeceb9e5829..77e8550bc19 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 4625d2eb570..a9b333f3f91 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_WINDOWS_CYGWIN=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index cb6238c254e..c02658bcd5d 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_WINDOWS_CYGWIN=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index e64e86fce00..18023c6270e 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -41,7 +41,7 @@ CONFIG_WINDOWS_CYGWIN=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index ab5c5da665c..ece521d8f1e 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index dc0a04bc13f..5a7eb1de7f3 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 4a702c26389..f2ee7176d45 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_DEBUG_SYMBOLS is not set
#
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index ef7487caa43..2a4dfbbd380 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index fb57aee0223..b6a7427380b 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
#
# Debug Options
#
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_INFO is not set
diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt
index 7c27c531447..b645c7f6b24 100644
--- a/configs/zkit-arm-1769/README.txt
+++ b/configs/zkit-arm-1769/README.txt
@@ -469,9 +469,9 @@ ZKit-ARM Configuration Options
CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
- CONFIG_DEBUG.
+ CONFIG_DEBUG_FEATURES.
CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
- Also needs CONFIG_DEBUG.
+ Also needs CONFIG_DEBUG_FEATURES.
CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 4cbbb539541..ee52a97f0cb 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 05e99cc696b..2ea0ad42a24 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index afb737eae7e..0b785d75fe0 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/src/lpc17_appinit.c b/configs/zkit-arm-1769/src/lpc17_appinit.c
index 9817d76c336..c8afc9304ef 100644
--- a/configs/zkit-arm-1769/src/lpc17_appinit.c
+++ b/configs/zkit-arm-1769/src/lpc17_appinit.c
@@ -116,13 +116,13 @@
/* Debug ********************************************************************/
#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
+# ifdef CONFIG_DEBUG_FEATURES
# define message(...) lib_lowprintf(__VA_ARGS__)
# else
# define message(...) printf(__VA_ARGS__)
# endif
#else
-# ifdef CONFIG_DEBUG
+# ifdef CONFIG_DEBUG_FEATURES
# define message lib_lowprintf
# else
# define message printf
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index a196c48e61b..b58e46b8536 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -68,7 +68,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
* CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index 75f62c931a1..02d4b03cfec 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -62,7 +62,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
* and pherhaps CONFIG_DEBUG_INFO too)
*/
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index 8a74fa08809..d28347c7233 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -63,7 +63,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index b0e65a378bb..f0667b4bba1 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -63,7 +63,7 @@
* Pre-processor Definitions
************************************************************************************/
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
#ifdef CONFIG_DEBUG_SPI
# define sspdbg lldbg
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 5f7f9ab01a8..ec26a6cdf4f 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/nsh/Make.defs b/configs/zp214xpa/nsh/Make.defs
index 5fdba6c38ba..4e6db0acdc8 100644
--- a/configs/zp214xpa/nsh/Make.defs
+++ b/configs/zp214xpa/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 1fa5f238cc5..01389b37f18 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/nxlines/Make.defs b/configs/zp214xpa/nxlines/Make.defs
index 8f8f9b00890..75b8a40e0c0 100644
--- a/configs/zp214xpa/nxlines/Make.defs
+++ b/configs/zp214xpa/nxlines/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
ARCHOPTIMIZATION = -g
endif
@@ -115,7 +115,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
LDFLAGS += -g
endif
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 580c2a8070c..5a285c01f40 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index 06d4853c876..c0336cef058 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -592,7 +592,7 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
/* Only the SPI1 interface is supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (port != 1)
{
return NULL;
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index 768a3a93a25..dc942bbace3 100644
--- a/drivers/analog/ads1242.c
+++ b/drivers/analog/ads1242.c
@@ -97,9 +97,9 @@ static void ads1242_set_negative_input(FAR struct ads1242_dev_s *dev,
ADS1242_NEGATIVE_INPUT_SELECTION const neg_in_sel);
static bool ads1242_is_data_ready(FAR struct ads1242_dev_s *dev);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg);
-#endif /* CONFIG_DEBUG && CONFIG_DEBUG_INFO */
+#endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
/* Character driver methods */
@@ -331,7 +331,7 @@ static void ads1242_set_gain(FAR struct ads1242_dev_s *dev,
setup_reg_value |= (uint8_t)(gain_selection);
ads1242_write_reg(dev, ADS1242_REG_SETUP, setup_reg_value);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
ads1242_print_regs(dev, "ads1242_set_gain");
#endif
@@ -355,7 +355,7 @@ static void ads1242_set_positive_input(FAR struct ads1242_dev_s *dev,
mux_reg_value |= (uint8_t)(pos_in_sel);
ads1242_write_reg(dev, ADS1242_REG_MUX, mux_reg_value);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
ads1242_print_regs(dev, "ads1242_set_positive_input");
#endif
}
@@ -375,7 +375,7 @@ static void ads1242_set_negative_input(FAR struct ads1242_dev_s *dev,
mux_reg_value |= (uint8_t)(neg_in_sel);
ads1242_write_reg(dev, ADS1242_REG_MUX, mux_reg_value);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
ads1242_print_regs(dev, "ads1242_set_negative_input");
#endif
}
@@ -396,7 +396,7 @@ static bool ads1242_is_data_ready(FAR struct ads1242_dev_s *dev)
* Name: ads1242_print_regs
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
{
uint8_t setup_reg_value = 0;
@@ -413,7 +413,7 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
dbg("MUX %02X\n", mux_reg_value);
dbg("ACR %02X\n", acr_reg_value);
}
-#endif /* CONFIG_DEBUG && CONFIG_DEBUG_INFO */
+#endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
/****************************************************************************
* Name: ads1242_open
@@ -441,7 +441,7 @@ static int ads1242_open(FAR struct file *filep)
ads1242_performSelfOffsetCalibration(priv);
up_mdelay(100);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
ads1242_print_regs(priv, "ads1242_open");
#endif
diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c
index ec991e0d062..0169459cddc 100644
--- a/drivers/analog/pga11x.c
+++ b/drivers/analog/pga11x.c
@@ -104,7 +104,7 @@
/* Debug ********************************************************************/
/* Check if (non-standard) SPI debug is enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index 8e11dd11496..27072548b5d 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -80,7 +80,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c
index 0c6a35d4b18..ae6ecb1dd0a 100644
--- a/drivers/bch/bchdev_unregister.c
+++ b/drivers/bch/bchdev_unregister.c
@@ -91,7 +91,7 @@ int bchdev_unregister(FAR const char *chardev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!chardev)
{
return -EINVAL;
diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index e6571b00064..817e6058e91 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -63,7 +63,7 @@
#define DEVNAME_FMTLEN (8 + 3 + 1)
/* Debug ********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
#ifdef CONFIG_DEBUG_I2C
# define i2cdbg dbg
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 349ccfa9a24..e28d053af7b 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -316,7 +316,7 @@ config STMPE811_TEMP_DISABLE
config STMPE811_REGDEBUG
bool "Enable Register-Level STMPE811 Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable very low register-level debug output.
diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c
index b0ce4f15aec..af938ae1573 100644
--- a/drivers/input/ajoystick.c
+++ b/drivers/input/ajoystick.c
@@ -794,7 +794,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index 98adf18b7ad..b56afeccb76 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -786,7 +786,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c
index a20451c13e5..b1b7522eb81 100644
--- a/drivers/input/djoystick.c
+++ b/drivers/input/djoystick.c
@@ -790,7 +790,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/mxt.h b/drivers/input/mxt.h
index 459684da727..94145b18012 100644
--- a/drivers/input/mxt.h
+++ b/drivers/input/mxt.h
@@ -49,7 +49,7 @@
/* Support T6 only if debug is enabled */
#undef MXT_SUPPORT_T6
-#if !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FEATURES)
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_INPUT
#endif
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 60362da51c8..21ad19c2c77 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -306,7 +306,7 @@ static inline int stmpe811_waitsample(FAR struct stmpe811_dev_s *priv,
if (ret < 0)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Sample the errno (debug output could change it) */
int errval = errno;
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index 49ff6f58847..c6f6eabb065 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -106,7 +106,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index a474a899de9..9bd49383330 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -100,7 +100,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 8a21afa3962..72e8dc7870d 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -238,7 +238,7 @@
* (Verbose debug must also be enabled)
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index dbc54f547cc..5a5164cfe3b 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -147,7 +147,7 @@
* Verbose debug must also be enabled
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index 309a7fb546e..11aad5b137d 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -103,7 +103,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index f0bd831137d..7b4d7a60347 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -66,7 +66,7 @@
/* Verbose debug must also be enabled */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index 8c4800d5fe0..98e994d17fd 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -104,7 +104,7 @@
* also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c
index 345b5f56951..96a50c369d1 100644
--- a/drivers/lcd/ssd1306_base.c
+++ b/drivers/lcd/ssd1306_base.c
@@ -742,7 +742,7 @@ static int ssd1306_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
/* Verify the contrast value */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (contrast > CONFIG_LCD_MAXCONTRAST)
{
return -EINVAL;
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 6350e0bda7a..8bcaea643ce 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -79,7 +79,7 @@
* ST7565 devices that will be supported. NOTE: At present, this
* must be undefined or defined to be 1.
* CONFIG_LCD_ST7565DEBUG - Enable detailed ST7565 debst7565 output
- * (CONFIG_DEBUG and CONFIG_VERBOSE must also be enabled).
+ * (CONFIG_DEBUG_FEATURES and CONFIG_VERBOSE must also be enabled).
*
* Required LCD driver settings:
* CONFIG_LCD_ST7565 - Enable ST7565 support
@@ -105,7 +105,7 @@
/* Verbose debst7565 must also be enabled to use the extra OLED debst7565 */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index 004f0deae49..ce5b06a92d2 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -80,7 +80,7 @@
* If the hardware supports a controllable OLED a power supply, this
* configuration shold be defined. (See st7567_power() below).
* CONFIG_LCD_ST7567DEBUG - Enable detailed ST7567 debst7567 output
- * (CONFIG_DEBUG and CONFIG_VERBOSE must also be enabled).
+ * (CONFIG_DEBUG_FEATURES and CONFIG_VERBOSE must also be enabled).
*
* Required LCD driver settings:
* CONFIG_LCD_ST7567 - Enable ST7567 support
@@ -123,7 +123,7 @@
/* Verbose debst7567 must also be enabled to use the extra OLED debst7567 */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index 7019ddbc5a5..21c42156318 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -961,7 +961,7 @@ static int ug2864ambag01_setcontrast(struct lcd_dev_s *dev, unsigned int contras
/* Verify the contrast value */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (contrast > CONFIG_LCD_MAXCONTRAST)
{
return -EINVAL;
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index 9fa03989f61..4f427d69a98 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -125,7 +125,7 @@
/* Verbose debug must also be enabled to use the extra OLED debug */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
#endif
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 43954bd63a2..dd074db27ab 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -61,7 +61,7 @@
* Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LEDS
#endif
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index ccc75a7971a..5ff237058be 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -379,7 +379,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!devname || !filename || !sectsize)
{
return -EINVAL;
@@ -485,7 +485,7 @@ int loteardown(FAR const char *devname)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!devname)
{
return -EINVAL;
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 1471208a59b..2b52f721420 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -171,7 +171,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2]);
static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv,
uint32_t csd[4]);
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv,
uint32_t cid[4]);
#else
@@ -558,7 +558,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
{
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
struct mmcsd_csd_s decoded;
#endif
unsigned int readbllen;
@@ -578,7 +578,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
* TRANSFER_RATE_UNIT 2:0 Rate mantissa
*/
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
memset(&decoded, 0, sizeof(struct mmcsd_csd_s));
decoded.csdstructure = csd[0] >> 30;
decoded.mmcspecvers = (csd[0] >> 26) & 0x0f;
@@ -606,7 +606,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
priv->dsrimp = (csd[1] >> 12) & 1;
readbllen = (csd[1] >> 16) & 0x0f;
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.ccc = (csd[1] >> 20) & 0x0fff;
decoded.readbllen = (csd[1] >> 16) & 0x0f;
decoded.readblpartial = (csd[1] >> 15) & 1;
@@ -667,7 +667,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
priv->blocksize = 1 << 9;
priv->nblocks = priv->capacity >> 9;
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.u.sdblock.csize = csize;
decoded.u.sdblock.sderblen = (csd[2] >> 14) & 1;
decoded.u.sdblock.sdsectorsize = (csd[2] >> 7) & 0x7f;
@@ -703,7 +703,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
priv->blockshift = 9;
}
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
if (IS_SD(priv->type))
{
decoded.u.sdbyte.csize = csize;
@@ -753,7 +753,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
tmpwriteprotect = (csd[3] >> 12) & 1;
priv->wrprotect = (permwriteprotect || tmpwriteprotect);
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.wpgrpen = csd[3] >> 31;
decoded.mmcdfltecc = (csd[3] >> 29) & 3;
decoded.r2wfactor = (csd[3] >> 26) & 7;
@@ -844,7 +844,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
{
struct mmcsd_cid_s decoded;
@@ -910,7 +910,7 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
static void mmcsd_decodeSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
{
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
struct mmcsd_scr_s decoded;
#endif
@@ -929,7 +929,7 @@ struct mmcsd_scr_s decoded;
priv->buswidth = (scr[0] >> 8) & 15;
#endif
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
#ifdef CONFIG_ENDIAN_BIG /* Card SCR is big-endian order / CPU also big-endian
* 60 56 52 48 44 40 36 32
* VVVV SSSS ESSS BBBB RRRR RRRR RRRR RRRR */
@@ -952,7 +952,7 @@ struct mmcsd_scr_s decoded;
* Reserved 31:0 32-bits reserved for manufacturing usage.
*/
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.mfgdata = scr[1]; /* Might be byte reversed! */
finfo("SCR:\n");
@@ -3251,7 +3251,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (minor < 0 || minor > 255 || !dev)
{
return -EINVAL;
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index bcd67e555bd..082ff094b0a 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -1031,7 +1031,7 @@ static int mmcsd_open(FAR struct inode *inode)
finfo("Entry\n");
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!inode || !inode->i_private)
{
fdbg("Internal confusion\n");
@@ -1044,7 +1044,7 @@ static int mmcsd_open(FAR struct inode *inode)
slot = (FAR struct mmcsd_slot_s *)inode->i_private;
spi = slot->spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!spi)
{
fdbg("Internal confusion\n");
@@ -1116,7 +1116,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
{
fdbg("Invalid parameters\n");
@@ -1135,7 +1135,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
slot = (FAR struct mmcsd_slot_s *)inode->i_private;
spi = slot->spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!spi)
{
fdbg("Internal confusion\n");
@@ -1270,7 +1270,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!buffer)
{
fdbg("Invalid parameters\n");
@@ -1289,7 +1289,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
slot = (FAR struct mmcsd_slot_s *)inode->i_private;
spi = slot->spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!spi)
{
fdbg("Internal confusion\n");
@@ -1452,7 +1452,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
uint8_t csd[16];
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!geometry)
{
fdbg("Invalid parameters\n");
@@ -1471,7 +1471,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
slot = (FAR struct mmcsd_slot_s *)inode->i_private;
spi = slot->spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!spi)
{
fdbg("Internal confusion\n");
@@ -1833,7 +1833,7 @@ static void mmcsd_mediachanged(void *arg)
uint8_t oldstate;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot || !slot->spi)
{
fdbg("Internal confusion\n");
@@ -1915,7 +1915,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
char devname[16];
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if ((unsigned)slotno >= CONFIG_MMCSD_NSLOTS || (unsigned)minor > 255 || !spi)
{
fdbg("Invalid arguments\n");
@@ -1929,7 +1929,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
memset(slot, 0, sizeof(struct mmcsd_slot_s));
sem_init(&slot->sem, 0, 1);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (slot->spi)
{
fdbg("Already registered\n");
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
index 18b2e19e1a9..89f6fb7b878 100644
--- a/drivers/mtd/filemtd.c
+++ b/drivers/mtd/filemtd.c
@@ -184,7 +184,7 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset,
* erased state.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (newvalue != srcvalue)
{
dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index cf22b4477da..98e61cb5789 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -466,7 +466,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
* driver.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (arg == 0)
{
fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
@@ -519,7 +519,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (minor < 0 || minor > 255 || !mtd)
{
return -EINVAL;
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index af63097723b..8bc9ac8b82d 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -169,7 +169,7 @@ static void *ram_write(FAR void *dest, FAR const void *src, size_t len)
* erased state.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (newvalue != srcvalue)
{
dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 7e54bf71fab..56629e26899 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -5104,7 +5104,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
* driver.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (arg == 0)
{
fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
@@ -5281,7 +5281,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (minor < 0 || minor > 255 || !mtd)
{
return -EINVAL;
@@ -5550,7 +5550,7 @@ static int smart_loteardown(FAR const char *devname)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!devname)
{
return -EINVAL;
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 53a12f0a02c..0c7e2cac619 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -697,7 +697,7 @@ static ssize_t sst39vf_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
static ssize_t sst39vf_read(FAR struct mtd_dev_s *dev, off_t offset,
size_t nbytes, FAR uint8_t *buffer)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
FAR struct sst39vf_dev_s *priv = (FAR struct sst39vf_dev_s *)dev;
#endif
FAR const uint8_t *source;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5e1ef3fee11..8852ead7b8e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -95,12 +95,12 @@ config NETDEV_LATEINIT
config NET_DUMPPACKET
bool "Enable packet dumping"
- depends on DEBUG
+ depends on DEBUG_FEATURES
default n
---help---
Some Ethernet MAC drivers supporting dumping of received and
transmitted packets as a debug option. This setting enables that
- debug option. Also needs DEBUG.
+ debug option. Also needs CONFIG_DEBUG_FEATURES.
comment "External Ethernet MAC Device Support"
@@ -234,9 +234,10 @@ config ENC28J60_DUMPPACKET
config ENC28J60_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG && DEBUG_NET
+ depends on DEBUG_FEATURES && DEBUG_NET
---help---
- Enable very low-level register access debug. Depends on DEBUG and DEBUG_NET.
+ Enable very low-level register access debug. Depends on
+ CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_NET.
endif # ENC28J60
@@ -296,9 +297,10 @@ config ENCX24J600_DUMPPACKET
config ENCX24J600_REGDEBUG
bool "Register-Level Debug"
default n
- depends on DEBUG && DEBUG_NET
+ depends on DEBUG_FEATURES && DEBUG_NET
---help---
- Enable very low-level register access debug. Depends on DEBUG and DEBUG_NET.
+ Enable very low-level register access debug. Depends on
+ CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_NET.
endif # ENCX24J600
@@ -495,7 +497,7 @@ endchoice
config NETDEV_PHY_DEBUG
bool "PHY debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Normally debug output is controlled by DEBUG_NET. However, that
may generate a LOT of debug output, especially if CONFIG_DEBUG_INFO is
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index c10782fbe6b..a9e26152edf 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -679,7 +679,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
register struct cs89x0_driver_s *cs89x0 = s89x0_mapirq(irq);
uint16_t isq;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!cs89x0)
{
return -ENODEV;
@@ -1010,7 +1010,7 @@ int cs89x0_initialize(FAR const cs89x0_driver_s *cs89x0, int devno)
{
/* Sanity checks -- only performed with debug enabled */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!cs89x0 || (unsigned)devno > CONFIG_CS89x0_NINTERFACES || g_cs89x00[devno])
{
return -EINVAL;
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 225cf13d7a3..ecc2d4a2e11 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -135,7 +135,7 @@
/* Low-level register debug */
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_NET)
# undef CONFIG_ENC28J60_REGDEBUG
#endif
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index b0fa6b430a7..67582d5c2d0 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -140,7 +140,7 @@
/* Low-level register debug */
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_NET)
# undef CONFIG_ENCX24J600_REGDEBUG
#endif
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 27c313038ab..c2ddfc44c97 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -230,7 +230,7 @@ static inline void telnet_dumpbuffer(FAR const char *msg,
FAR const char *buffer,
unsigned int nbytes)
{
- /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
+ /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
* defined or the following does nothing.
*/
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index a21fa91d124..ef70eb100f0 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -186,7 +186,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
* we reset the TX buffer directly.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
cprintf("VNET: TX buffer is full\n");
#endif
return ERROR;
@@ -308,7 +308,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
if (len > CONFIG_NET_ETH_MTU || len < 14)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
cprintf("VNET: receive invalid packet of size %d\n", len);
#endif
return;
@@ -506,7 +506,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...)
if (vnet_is_txbuff_full(vnet->vnet))
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
cprintf("VNET: TX buffer is full\n");
#endif
return;
@@ -640,7 +640,7 @@ static int vnet_txavail(struct net_driver_s *dev)
if (vnet_is_txbuff_full(vnet->vnet))
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
cprintf("VNET: TX buffer is full\n");
#endif
goto out;
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 1541fecd465..3d45b8fdacd 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -56,7 +56,7 @@
#include
#include
#include
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# include
#endif
@@ -722,7 +722,7 @@ int pipecommon_poll(FAR struct file *filep, FAR struct pollfd *fds,
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
ret = -EIO;
@@ -752,7 +752,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct pipe_dev_s *dev = inode->i_private;
int ret = -EINVAL;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Some sanity checking */
if (dev == NULL)
diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c
index 172adde32fe..ef35b116564 100644
--- a/drivers/ramdisk.c
+++ b/drivers/ramdisk.c
@@ -456,7 +456,7 @@ int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (minor < 0 || minor > 255 || !buffer || !nsectors || !sectsize)
{
return -EINVAL;
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 78e4cd009ab..c369db5fc54 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -136,7 +136,7 @@ config ADXL345_ACTIVELOW
config ADXL345_REGDEBUG
bool "Enable Register-Level ADXL345 Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable very low register-level debug output.
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ef4858171dc..d5435539f76 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -531,7 +531,7 @@ endif # SERIAL_IFLOWCONTROL_WATERMARKS
config SERIAL_TIOCSERGSTRUCT
bool "Support TIOCSERGSTRUCT"
default n
- depends on DEBUG && (MCU_SERIAL || 16550_UART)
+ depends on DEBUG_FEATURES && (MCU_SERIAL || 16550_UART)
---help---
As a debug option, many serial bottom half drivers support the TIOCSERGSTRUCT
that allows you to get the internal driver data structure. By default, this
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index fe56f46d44a..2d8056e1265 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -998,7 +998,7 @@ int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
/* Some sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !fds)
{
return -ENODEV;
@@ -1104,7 +1104,7 @@ int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
struct pollfd **slot = (struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
ret = -EIO;
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 78f1e1c88f4..ec3a1512e1b 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -83,7 +83,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index 1025500987f..ad62e935f15 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -615,7 +615,7 @@ int ramlog_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
struct pollfd **slot = (struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
ret = -EIO;
diff --git a/drivers/timers/Kconfig b/drivers/timers/Kconfig
index ef5d6aed715..076cc43c8bf 100644
--- a/drivers/timers/Kconfig
+++ b/drivers/timers/Kconfig
@@ -237,11 +237,11 @@ if TIMERS_CS2100CP
config CS2100CP_DEBUG
bool "Enable CS2100-CP Debug Features"
- depends on DEBUG
+ depends on DEBUG_FEATURES
config CS2100CP_REGDEBUG
bool "Enable CS2100-CP Register Debug"
- depends on DEBUG
+ depends on DEBUG_FEATURES
endif # TIMERS_CS2100CP
endmenu # Timer Driver Support
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index cc45f4b29e7..630ba72259e 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -77,7 +77,7 @@
#define DS3231_I2C_ADDRESS 0x68
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index b513c9f8ac8..93619f2d93c 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -77,7 +77,7 @@
#define PCF85263_I2C_ADDRESS 0x51
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_RTC
#endif
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index ab48720c213..48dbdf5cb0b 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -339,7 +339,7 @@ static int cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv)
int len;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (priv == NULL)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -643,7 +643,7 @@ static int cdcacm_setconfig(FAR struct cdcacm_dev_s *priv, uint8_t config)
int i;
int ret = 0;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (priv == NULL)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -817,7 +817,7 @@ static void cdcacm_rdcomplete(FAR struct usbdev_ep_s *ep,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -880,7 +880,7 @@ static void cdcacm_wrcomplete(FAR struct usbdev_ep_s *ep,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req || !req->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1120,7 +1120,7 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSUNBIND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1132,7 +1132,7 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1248,7 +1248,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
uint16_t len;
int ret = -EOPNOTSUPP;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !ctrl)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1261,7 +1261,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSETUP, ctrl->req);
priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || !priv->ctrlreq)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1621,7 +1621,7 @@ static void cdcacm_disconnect(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSDISCONNECT, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1633,7 +1633,7 @@ static void cdcacm_disconnect(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1686,7 +1686,7 @@ static void cdcacm_suspend(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSUSPEND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1720,7 +1720,7 @@ static void cdcacm_resume(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSRESUME, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1763,7 +1763,7 @@ static int cdcuart_setup(FAR struct uart_dev_s *dev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1804,7 +1804,7 @@ static void cdcuart_shutdown(FAR struct uart_dev_s *dev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2063,7 +2063,7 @@ static void cdcuart_rxint(FAR struct uart_dev_s *dev, bool enable)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2192,7 +2192,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
/* Sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2235,7 +2235,7 @@ static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
usbtrace(CDCACM_CLASSAPI_TXEMPTY, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 7a4f3fdc243..54bc3c827e3 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -339,7 +339,7 @@ static void composite_unbind(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSUNBIND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -351,7 +351,7 @@ static void composite_unbind(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct composite_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -403,7 +403,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
bool dispatched = false;
int ret = -EOPNOTSUPP;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0 || !ctrl)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_SETUPINVALIDARGS), 0);
@@ -416,7 +416,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSETUP, ctrl->req);
priv = ((FAR struct composite_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND2), 0);
@@ -638,7 +638,7 @@ static void composite_disconnect(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSDISCONNECT, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -650,7 +650,7 @@ static void composite_disconnect(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct composite_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -691,7 +691,7 @@ static void composite_suspend(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSUSPEND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -703,7 +703,7 @@ static void composite_suspend(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct composite_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -733,7 +733,7 @@ static void composite_resume(FAR struct usbdevclass_driver_s *driver,
FAR struct composite_dev_s *priv = NULL;
irqstate_t flags;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -745,7 +745,7 @@ static void composite_resume(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct composite_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 0a07ebaa667..16119057903 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -598,7 +598,7 @@ static int usbclass_sndpacket(FAR struct pl2303_dev_s *priv)
int len;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (priv == NULL)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1047,7 +1047,7 @@ static int usbclass_setconfig(FAR struct pl2303_dev_s *priv, uint8_t config)
int i;
int ret = 0;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (priv == NULL)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1203,7 +1203,7 @@ static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1265,7 +1265,7 @@ static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req || !req->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1489,7 +1489,7 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSUNBIND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1501,7 +1501,7 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct pl2303_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1616,7 +1616,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
uint16_t len;
int ret = -EOPNOTSUPP;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0 || !ctrl)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1629,7 +1629,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSETUP, ctrl->req);
priv = ((FAR struct pl2303_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || !priv->ctrlreq)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1877,7 +1877,7 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSDISCONNECT, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1889,7 +1889,7 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct pl2303_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1940,7 +1940,7 @@ static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSUSPEND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1974,7 +1974,7 @@ static void usbclass_resume(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSRESUME, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2017,7 +2017,7 @@ static int usbser_setup(FAR struct uart_dev_s *dev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2058,7 +2058,7 @@ static void usbser_shutdown(FAR struct uart_dev_s *dev)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2120,7 +2120,7 @@ static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2211,7 +2211,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
/* Sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev || !dev->priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2254,7 +2254,7 @@ static bool usbser_txempty(FAR struct uart_dev_s *dev)
usbtrace(PL2303_CLASSAPI_TXEMPTY, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
diff --git a/drivers/usbdev/usbdev_trace.c b/drivers/usbdev/usbdev_trace.c
index be19863b1ba..3e9831562e2 100644
--- a/drivers/usbdev/usbdev_trace.c
+++ b/drivers/usbdev/usbdev_trace.c
@@ -81,7 +81,7 @@ static uint16_t g_head = 0;
static uint16_t g_tail = 0;
#endif
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
static usbtrace_idset_t g_maskedidset = CONFIG_USBDEV_TRACE_INITIALIDSET;
#endif
@@ -94,7 +94,7 @@ static usbtrace_idset_t g_maskedidset = CONFIG_USBDEV_TRACE_INITIALIDSET;
****************************************************************************/
#if !defined(CONFIG_USBDEV_TRACE) && \
- (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+ (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
static int usbtrace_syslog(const char *fmt, ...)
{
va_list ap;
@@ -132,7 +132,7 @@ static int usbtrace_syslog(const char *fmt, ...)
****************************************************************************/
#if defined(CONFIG_USBDEV_TRACE) || \
- (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+ (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
{
irqstate_t flags;
@@ -146,7 +146,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
leave_critical_section(flags);
return ret;
}
-#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
/****************************************************************************
* Name: usbtrace
@@ -159,7 +159,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
*
****************************************************************************/
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
void usbtrace(uint16_t event, uint16_t value)
{
irqstate_t flags;
@@ -198,7 +198,7 @@ void usbtrace(uint16_t event, uint16_t value)
leave_critical_section(flags);
}
-#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
/****************************************************************************
* Name: usbtrace_enumerate
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 34873c1a81f..35fc5cf5a32 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -404,7 +404,7 @@ static void usbmsc_unbind(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSUNBIND, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNBINDINVALIDARGS), 0);
@@ -416,7 +416,7 @@ static void usbmsc_unbind(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND1), 0);
@@ -521,7 +521,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
uint16_t len;
int ret = -EOPNOTSUPP;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0 || !ctrl)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_SETUPINVALIDARGS), 0);
@@ -534,7 +534,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSSETUP, ctrl->req);
priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || !priv->ctrlreq)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND2), 0);
@@ -847,7 +847,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
usbtrace(TRACE_CLASSDISCONNECT, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!driver || !dev || !dev->ep0)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_DISCONNECTINVALIDARGS), 0);
@@ -859,7 +859,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND3), 0);
@@ -935,7 +935,7 @@ int usbmsc_setconfig(FAR struct usbmsc_dev_s *priv, uint8_t config)
int i;
int ret = 0;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (priv == NULL)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_SETCONFIGINVALIDARGS), 0);
@@ -1074,7 +1074,7 @@ void usbmsc_wrcomplete(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req || !req->priv)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS), 0);
@@ -1135,7 +1135,7 @@ void usbmsc_rdcomplete(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ep || !ep->priv || !req || !req->priv)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_RDCOMPLETEINVALIDARGS), 0);
@@ -1227,7 +1227,7 @@ void usbmsc_deferredresponse(FAR struct usbmsc_dev_s *priv, bool failed)
FAR struct usbdev_req_s *ctrlreq;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv || !priv->usbdev || !priv->ctrlreq)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_DEFERREDRESPINVALIDARGS), 0);
@@ -1317,7 +1317,7 @@ int usbmsc_configure(unsigned int nluns, void **handle)
FAR struct usbmsc_driver_s *drvr;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (nluns > 15)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_TOOMANYLUNS), 0);
@@ -1411,7 +1411,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
struct geometry geo;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!alloc || !drvrpath || startsector < 0)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_BINLUNINVALIDARGS1), 0);
@@ -1421,7 +1421,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
priv = &alloc->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->luntab)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_INTERNALCONFUSION1), 0);
@@ -1437,7 +1437,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
lun = &priv->luntab[lunno];
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (lun->inode != NULL)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_LUNALREADYBOUND), 0);
@@ -1552,7 +1552,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
FAR struct usbmsc_lun_s *lun;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!alloc)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNBINDLUNINVALIDARGS1), 0);
@@ -1562,7 +1562,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
priv = &alloc->dev;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!priv->luntab)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_INTERNALCONFUSION2), 0);
@@ -1579,7 +1579,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
lun = &priv->luntab[lunno];
usbmsc_scsi_lock(priv);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (lun->inode == NULL)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_LUNNOTBOUND), 0);
@@ -1626,7 +1626,7 @@ int usbmsc_exportluns(FAR void *handle)
irqstate_t flags;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!alloc)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EXPORTLUNSINVALIDARGS), 0);
@@ -1756,7 +1756,7 @@ void usbmsc_uninitialize(FAR void *handle)
#endif
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!handle)
{
usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNINITIALIZEINVALIDARGS), 0);
diff --git a/drivers/usbhost/usbhost_trace.c b/drivers/usbhost/usbhost_trace.c
index cd1ef92c4fc..ba47097fa84 100644
--- a/drivers/usbhost/usbhost_trace.c
+++ b/drivers/usbhost/usbhost_trace.c
@@ -190,7 +190,7 @@ void usbhost_trace_common(uint32_t event)
****************************************************************************/
#if defined(CONFIG_USBHOST_TRACE) || \
- (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+ (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
void usbhost_trace1(uint16_t id, uint32_t u23)
{
@@ -228,7 +228,7 @@ void usbhost_trace2(uint16_t id, uint8_t u7, uint16_t u16)
#endif
}
-#endif /* CONFIG_USBHOST_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBHOST_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
/****************************************************************************
* Name: usbtrace_enumerate
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 523971c748e..56c2fe89fdc 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -104,7 +104,7 @@ endchoice
config OV2640_REGDEBUG
bool "Register level debug output"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Enable details, register level debug output.
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index b14b8a94a6e..12413070df4 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -113,7 +113,7 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
#define FREE_SLOT -1
#define CLOSE_SLOT -2
-#if defined(CONFIG_DEBUG) && defined(CONFIG_CC3000_PROBES)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_CC3000_PROBES)
# define CC3000_GUARD (0xc35aa53c)
# define INIT_GUARD(p) p->guard = CC3000_GUARD
# define CHECK_GUARD(p) DEBUGASSERT(p->guard == CC3000_GUARD)
diff --git a/drivers/wireless/cc3000/cc3000.h b/drivers/wireless/cc3000/cc3000.h
index 0ebc118ebb8..ddcd4f5163c 100644
--- a/drivers/wireless/cc3000/cc3000.h
+++ b/drivers/wireless/cc3000/cc3000.h
@@ -168,7 +168,7 @@ struct cc3000_dev_s
struct pollfd *fds[CONFIG_CC3000_NPOLLWAITERS];
#endif
-#if defined(CONFIG_DEBUG) && defined(CONFIG_CC3000_PROBES)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_CC3000_PROBES)
long guard;
#endif
diff --git a/fs/Kconfig b/fs/Kconfig
index 150bbcdde99..fe436402b3a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -21,7 +21,7 @@ config FS_AUTOMOUNTER
config FS_AUTOMOUNTER_DEBUG
bool "Auto-mounter debug"
default n
- depends on FS_AUTOMOUNTER && DEBUG
+ depends on FS_AUTOMOUNTER && DEBUG_FEATURES
---help---
Normally, the auto-mounter will generate debug output when sub-system
level file system debug is enabled. This option will select debug
diff --git a/fs/driver/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c
index 3280236af14..ea39e99e538 100644
--- a/fs/driver/fs_closeblockdriver.c
+++ b/fs/driver/fs_closeblockdriver.c
@@ -72,7 +72,7 @@ int close_blockdriver(FAR struct inode *inode)
/* Sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!inode || !inode->u.i_bops)
{
ret = -EINVAL;
diff --git a/fs/driver/fs_devsyslog.c b/fs/driver/fs_devsyslog.c
index b33129a9241..2c35dab48dd 100644
--- a/fs/driver/fs_devsyslog.c
+++ b/fs/driver/fs_devsyslog.c
@@ -167,7 +167,7 @@ static inline int syslog_takesem(void)
static inline void syslog_givesem(void)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
pid_t me = getpid();
DEBUGASSERT(g_sysdev.sl_holder == me);
#endif
diff --git a/fs/driver/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c
index 86b2c65a158..bfbb0ac59ea 100644
--- a/fs/driver/fs_findblockdriver.c
+++ b/fs/driver/fs_findblockdriver.c
@@ -83,7 +83,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
/* Sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!pathname || !ppinode)
{
ret = -EINVAL;
diff --git a/fs/driver/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c
index 28527515759..bfdf3caadc5 100644
--- a/fs/driver/fs_openblockdriver.c
+++ b/fs/driver/fs_openblockdriver.c
@@ -81,7 +81,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
/* Minimal sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!ppinode)
{
ret = -EINVAL;
diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c
index 5898887ca1c..f152e45dd1f 100644
--- a/fs/fat/fs_configfat.c
+++ b/fs/fat/fs_configfat.c
@@ -973,7 +973,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
/* Describe the configured filesystem */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
fdbg("Sector size: %d bytes\n", var->fv_sectorsize);
fdbg("Number of sectors: %d sectors\n", fmt->ff_nsectors);
fdbg("FAT size: %d bits\n", var->fv_fattype);
diff --git a/fs/fat/fs_mkfatfs.c b/fs/fat/fs_mkfatfs.c
index a1f17d73745..6e083703c6c 100644
--- a/fs/fat/fs_mkfatfs.c
+++ b/fs/fat/fs_mkfatfs.c
@@ -193,7 +193,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
/* Verify format options (only when DEBUG enabled) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!pathname)
{
fdbg("ERROR: No block driver path\n");
@@ -228,7 +228,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
* means that we should autoselect the cluster sizel.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (fmt->ff_clustshift > 7 && fmt->ff_clustshift != 0xff)
{
fdbg("ERROR: Invalid cluster shift value: %d\n", fmt->ff_clustshift);
diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c
index 501db402823..fd23f7647b2 100644
--- a/fs/mmap/fs_mmap.c
+++ b/fs/mmap/fs_mmap.c
@@ -131,7 +131,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
* things.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (prot == PROT_NONE ||
(flags & (MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS | MAP_DENYWRITE)) != 0)
{
diff --git a/fs/nxffs/nxffs_dump.c b/fs/nxffs/nxffs_dump.c
index 1be0e294ac6..1bfba3177e6 100644
--- a/fs/nxffs/nxffs_dump.c
+++ b/fs/nxffs/nxffs_dump.c
@@ -67,7 +67,7 @@ struct nxffs_blkinfo_s
off_t nblocks;
off_t block;
off_t offset;
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
bool verbose;
#endif
};
@@ -91,7 +91,7 @@ static const char g_format[] = " %5d:%-5d %s %s %5d\n";
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
static inline ssize_t nxffs_analyzeinode(FAR struct nxffs_blkinfo_s *blkinfo,
int offset)
{
@@ -239,7 +239,7 @@ static inline ssize_t nxffs_analyzeinode(FAR struct nxffs_blkinfo_s *blkinfo,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
static inline ssize_t nxffs_analyzedata(FAR struct nxffs_blkinfo_s *blkinfo,
int offset)
{
@@ -297,7 +297,7 @@ static inline ssize_t nxffs_analyzedata(FAR struct nxffs_blkinfo_s *blkinfo,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
{
FAR struct nxffs_block_s *blkhdr;
@@ -403,7 +403,7 @@ static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
* Name: nxffs_dump
*
* Description:
- * Dump a summary of the contents of an NXFFS file system. CONFIG_DEBUG
+ * Dump a summary of the contents of an NXFFS file system. CONFIG_DEBUG_FEATURES
* and CONFIG_DEBUG_FS must be enabled for this function to do anything.
*
* Input Parameters:
@@ -419,7 +419,7 @@ static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose)
{
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
struct nxffs_blkinfo_s blkinfo;
int ret;
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 19e419a5de3..6a5aa49e918 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -253,7 +253,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
/* Get statistics on the re-formatted volume */
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
ret = nxffs_blockstats(volume, &stats);
if (ret < 0)
{
@@ -284,7 +284,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
/* Get statistics on the re-formatted volume */
-#if defined(CONFIG_NXFFS_SCAN_VOLUME) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_NXFFS_SCAN_VOLUME) && defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
ret = nxffs_blockstats(volume, &stats);
if (ret < 0)
{
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index a461d2c0806..64db2704260 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -1064,7 +1064,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
FAR struct nxffs_volume_s *volume;
#endif
FAR struct nxffs_ofile_s *ofile;
@@ -1073,7 +1073,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
/* Sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
DEBUGASSERT(oldp->f_priv == NULL && oldp->f_inode != NULL);
/* Get the mountpoint private data from the NuttX inode reference in the
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index 91686d32d69..e48c6e71e22 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -979,7 +979,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
finfo("Entry\n");
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!rm)
{
return -EINVAL;
diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c
index da4b7685cda..045bed977f2 100644
--- a/fs/romfs/fs_romfsutil.c
+++ b/fs/romfs/fs_romfsutil.c
@@ -499,7 +499,7 @@ int romfs_hwconfigure(struct romfs_mountpt_s *rm)
/* Get the underlying device geometry */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!inode || !inode->u.i_bops || !inode->u.i_bops->geometry)
{
return -ENODEV;
diff --git a/graphics/nxbe/nxbe_bitmap.c b/graphics/nxbe/nxbe_bitmap.c
index c4d29681a24..5c94d0b04dc 100644
--- a/graphics/nxbe/nxbe_bitmap.c
+++ b/graphics/nxbe/nxbe_bitmap.c
@@ -125,7 +125,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
unsigned int deststride;
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !dest || !src || !origin)
{
return;
diff --git a/graphics/nxbe/nxbe_closewindow.c b/graphics/nxbe/nxbe_closewindow.c
index 04f5b9b23d4..44520da22c1 100644
--- a/graphics/nxbe/nxbe_closewindow.c
+++ b/graphics/nxbe/nxbe_closewindow.c
@@ -70,7 +70,7 @@ void nxbe_closewindow(struct nxbe_window_s *wnd)
{
FAR struct nxbe_state_s *be;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
diff --git a/graphics/nxbe/nxbe_configure.c b/graphics/nxbe/nxbe_configure.c
index 5dc9b49c19c..f3aae2433df 100644
--- a/graphics/nxbe/nxbe_configure.c
+++ b/graphics/nxbe/nxbe_configure.c
@@ -99,7 +99,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
/* Check the number of color planes */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (be->vinfo.nplanes > CONFIG_NX_NPLANES)
{
gdbg("NX configured for only %d planes, controller wants %d\n",
diff --git a/graphics/nxbe/nxbe_fill.c b/graphics/nxbe/nxbe_fill.c
index c87992052e1..671a3e7ab96 100644
--- a/graphics/nxbe/nxbe_fill.c
+++ b/graphics/nxbe/nxbe_fill.c
@@ -112,7 +112,7 @@ void nxbe_fill(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s remaining;
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect)
{
return;
diff --git a/graphics/nxbe/nxbe_filltrapezoid.c b/graphics/nxbe/nxbe_filltrapezoid.c
index cf3b3096a3c..1936a6c4d62 100644
--- a/graphics/nxbe/nxbe_filltrapezoid.c
+++ b/graphics/nxbe/nxbe_filltrapezoid.c
@@ -137,7 +137,7 @@ void nxbe_filltrapezoid(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s remaining;
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !trap)
{
return;
diff --git a/graphics/nxbe/nxbe_getrectangle.c b/graphics/nxbe/nxbe_getrectangle.c
index e7ec53d2b08..2e707a816cd 100644
--- a/graphics/nxbe/nxbe_getrectangle.c
+++ b/graphics/nxbe/nxbe_getrectangle.c
@@ -87,7 +87,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
{
struct nxgl_rect_s remaining;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes)
{
ginfo("Invalid parameters\n");
diff --git a/graphics/nxbe/nxbe_move.c b/graphics/nxbe/nxbe_move.c
index 9bf56fd1e9c..e2eee9f01bb 100644
--- a/graphics/nxbe/nxbe_move.c
+++ b/graphics/nxbe/nxbe_move.c
@@ -208,7 +208,7 @@ void nxbe_move(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect
struct nxbe_move_s info;
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect)
{
return;
diff --git a/graphics/nxbe/nxbe_setpixel.c b/graphics/nxbe/nxbe_setpixel.c
index 81627f0608d..0b61897381a 100644
--- a/graphics/nxbe/nxbe_setpixel.c
+++ b/graphics/nxbe/nxbe_setpixel.c
@@ -112,7 +112,7 @@ void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s rect;
int i;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !pos)
{
return;
diff --git a/graphics/nxbe/nxbe_setposition.c b/graphics/nxbe/nxbe_setposition.c
index 5647270e548..a40a01ebe79 100644
--- a/graphics/nxbe/nxbe_setposition.c
+++ b/graphics/nxbe/nxbe_setposition.c
@@ -63,7 +63,7 @@ void nxbe_setposition(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s before;
struct nxgl_rect_s rect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
diff --git a/graphics/nxbe/nxbe_setsize.c b/graphics/nxbe/nxbe_setsize.c
index b542c0a8e87..3b522d38a40 100644
--- a/graphics/nxbe/nxbe_setsize.c
+++ b/graphics/nxbe/nxbe_setsize.c
@@ -62,7 +62,7 @@ void nxbe_setsize(FAR struct nxbe_window_s *wnd,
{
struct nxgl_rect_s bounds;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
diff --git a/graphics/nxmu/nxmu_releasebkgd.c b/graphics/nxmu/nxmu_releasebkgd.c
index 4762e69f8a9..7f8d2935076 100644
--- a/graphics/nxmu/nxmu_releasebkgd.c
+++ b/graphics/nxmu/nxmu_releasebkgd.c
@@ -88,7 +88,7 @@ void nxmu_releasebkgd(FAR struct nxfe_state_s *fe)
{
FAR struct nxbe_state_s *be = &fe->be;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!fe)
{
return;
diff --git a/graphics/nxmu/nxmu_requestbkgd.c b/graphics/nxmu/nxmu_requestbkgd.c
index d25516008dd..23f7748fc30 100644
--- a/graphics/nxmu/nxmu_requestbkgd.c
+++ b/graphics/nxmu/nxmu_requestbkgd.c
@@ -92,7 +92,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
FAR const struct nx_callback_s *cb,
FAR void *arg)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !be || !cb)
{
errno = EINVAL;
diff --git a/graphics/nxmu/nxmu_sendclient.c b/graphics/nxmu/nxmu_sendclient.c
index 95b60581f0a..66a992e5267 100644
--- a/graphics/nxmu/nxmu_sendclient.c
+++ b/graphics/nxmu/nxmu_sendclient.c
@@ -92,7 +92,7 @@ int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !conn->swrmq)
{
set_errno(EINVAL);
diff --git a/graphics/nxmu/nxmu_sendclientwindow.c b/graphics/nxmu/nxmu_sendclientwindow.c
index c06c9f225e1..e8ce5276a17 100644
--- a/graphics/nxmu/nxmu_sendclientwindow.c
+++ b/graphics/nxmu/nxmu_sendclientwindow.c
@@ -92,7 +92,7 @@ int nxmu_sendclientwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !wnd->conn)
{
set_errno(EINVAL);
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 3d5822b5bb4..680e4cde164 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -301,7 +301,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!mqname || !dev)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_bitmap.c b/graphics/nxsu/nx_bitmap.c
index b9d732bee61..59f3199c2d3 100644
--- a/graphics/nxsu/nx_bitmap.c
+++ b/graphics/nxsu/nx_bitmap.c
@@ -97,7 +97,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
FAR const void *src[CONFIG_NX_NPLANES],
FAR const struct nxgl_point_s *origin, unsigned int stride)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !dest || !src || !origin)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_closewindow.c b/graphics/nxsu/nx_closewindow.c
index 07fedac83df..bd3c0e44f04 100644
--- a/graphics/nxsu/nx_closewindow.c
+++ b/graphics/nxsu/nx_closewindow.c
@@ -86,7 +86,7 @@
int nx_closewindow(NXWINDOW hwnd)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_constructwindow.c b/graphics/nxsu/nx_constructwindow.c
index 62bf138e9f9..ca468809d86 100644
--- a/graphics/nxsu/nx_constructwindow.c
+++ b/graphics/nxsu/nx_constructwindow.c
@@ -107,7 +107,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
FAR struct nxbe_state_s *be = &fe->be;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
diff --git a/graphics/nxsu/nx_fill.c b/graphics/nxsu/nx_fill.c
index 1659df1869c..adf3d16236e 100644
--- a/graphics/nxsu/nx_fill.c
+++ b/graphics/nxsu/nx_fill.c
@@ -90,7 +90,7 @@
int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !rect || !color)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_filltrapezoid.c b/graphics/nxsu/nx_filltrapezoid.c
index dbe99b943af..dcbace13eb0 100644
--- a/graphics/nxsu/nx_filltrapezoid.c
+++ b/graphics/nxsu/nx_filltrapezoid.c
@@ -92,7 +92,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
FAR const struct nxgl_trapezoid_s *trap,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !trap || !color)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_getposition.c b/graphics/nxsu/nx_getposition.c
index c41048862df..86326db1887 100644
--- a/graphics/nxsu/nx_getposition.c
+++ b/graphics/nxsu/nx_getposition.c
@@ -87,7 +87,7 @@
int nx_getposition(NXWINDOW hwnd)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_getrectangle.c b/graphics/nxsu/nx_getrectangle.c
index ed3ebf42685..37e5b8b2148 100644
--- a/graphics/nxsu/nx_getrectangle.c
+++ b/graphics/nxsu/nx_getrectangle.c
@@ -96,7 +96,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
unsigned int plane, FAR uint8_t *dest,
unsigned int deststride)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !rect || !dest)
{
set_errno(EINVAL);
diff --git a/graphics/nxsu/nx_lower.c b/graphics/nxsu/nx_lower.c
index 877c89ce6b5..b6693cb0a55 100644
--- a/graphics/nxsu/nx_lower.c
+++ b/graphics/nxsu/nx_lower.c
@@ -85,7 +85,7 @@
int nx_lower(NXWINDOW hwnd)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_move.c b/graphics/nxsu/nx_move.c
index 6404bf48ac2..54f17b696f7 100644
--- a/graphics/nxsu/nx_move.c
+++ b/graphics/nxsu/nx_move.c
@@ -88,7 +88,7 @@
int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR const struct nxgl_point_s *offset)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index ae0007c247f..a89340d37e3 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -187,7 +187,7 @@ NXHANDLE nx_open(FAR NX_DRIVERTYPE *dev)
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_openwindow.c b/graphics/nxsu/nx_openwindow.c
index 3be9d5393af..3ff6b5a5f13 100644
--- a/graphics/nxsu/nx_openwindow.c
+++ b/graphics/nxsu/nx_openwindow.c
@@ -95,7 +95,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxbe_window_s *wnd;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!handle || !cb)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_raise.c b/graphics/nxsu/nx_raise.c
index 7e963577a31..ae7f72480ce 100644
--- a/graphics/nxsu/nx_raise.c
+++ b/graphics/nxsu/nx_raise.c
@@ -85,7 +85,7 @@
int nx_raise(NXWINDOW hwnd)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_releasebkgd.c b/graphics/nxsu/nx_releasebkgd.c
index 8c2181f2d04..6a0e5f42085 100644
--- a/graphics/nxsu/nx_releasebkgd.c
+++ b/graphics/nxsu/nx_releasebkgd.c
@@ -88,7 +88,7 @@ int nx_releasebkgd(NXWINDOW hwnd)
{
FAR struct nxbe_window_s *bkgd = (FAR struct nxbe_window_s *)hwnd;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!bkgd)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_requestbkgd.c b/graphics/nxsu/nx_requestbkgd.c
index e5aaad311e9..5441adaaae5 100644
--- a/graphics/nxsu/nx_requestbkgd.c
+++ b/graphics/nxsu/nx_requestbkgd.c
@@ -115,7 +115,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
FAR struct nxbe_state_s *be = &fe->be;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!fe || !cb)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_setbgcolor.c b/graphics/nxsu/nx_setbgcolor.c
index 3b6af806266..ab1e974bbba 100644
--- a/graphics/nxsu/nx_setbgcolor.c
+++ b/graphics/nxsu/nx_setbgcolor.c
@@ -89,7 +89,7 @@ int nx_setbgcolor(NXHANDLE handle,
{
FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!fe)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_setpixel.c b/graphics/nxsu/nx_setpixel.c
index 37ce41af392..35e10832afd 100644
--- a/graphics/nxsu/nx_setpixel.c
+++ b/graphics/nxsu/nx_setpixel.c
@@ -91,7 +91,7 @@
int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !pos || !color)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_setposition.c b/graphics/nxsu/nx_setposition.c
index e138ea97330..e2799f6261c 100644
--- a/graphics/nxsu/nx_setposition.c
+++ b/graphics/nxsu/nx_setposition.c
@@ -86,7 +86,7 @@
int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !pos)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nx_setsize.c b/graphics/nxsu/nx_setsize.c
index 7be045b90e9..bec2f7642a1 100644
--- a/graphics/nxsu/nx_setsize.c
+++ b/graphics/nxsu/nx_setsize.c
@@ -86,7 +86,7 @@
int nx_setsize(NXWINDOW hwnd, FAR const struct nxgl_size_s *size)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !size)
{
errno = EINVAL;
diff --git a/graphics/nxsu/nxsu_redrawreq.c b/graphics/nxsu/nxsu_redrawreq.c
index 9871e879c50..f903639f664 100644
--- a/graphics/nxsu/nxsu_redrawreq.c
+++ b/graphics/nxsu/nxsu_redrawreq.c
@@ -82,7 +82,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s
{
struct nxgl_rect_s relrect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
diff --git a/graphics/nxsu/nxsu_reportposition.c b/graphics/nxsu/nxsu_reportposition.c
index 043caee8a6f..9a3be6a61f4 100644
--- a/graphics/nxsu/nxsu_reportposition.c
+++ b/graphics/nxsu/nxsu_reportposition.c
@@ -82,7 +82,7 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
FAR struct nxbe_state_s *be;
struct nxgl_size_s size;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
diff --git a/graphics/nxterm/Make.defs b/graphics/nxterm/Make.defs
index 5a02507313f..469d4bfde27 100644
--- a/graphics/nxterm/Make.defs
+++ b/graphics/nxterm/Make.defs
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_NXTERM_NXKBDIN),y)
CSRCS += nxterm_kbdin.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += nxterm_sem.c
endif
diff --git a/graphics/nxterm/nxterm.h b/graphics/nxterm/nxterm.h
index 1a082e52837..326a2ed5f9b 100644
--- a/graphics/nxterm/nxterm.h
+++ b/graphics/nxterm/nxterm.h
@@ -141,7 +141,7 @@ struct nxterm_state_s
FAR struct nxterm_window_s wndo; /* Describes the window and font */
NXHANDLE font; /* The current font handle */
sem_t exclsem; /* Forces mutually exclusive access */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
pid_t holder; /* Deadlock avoidance */
#endif
uint8_t minor; /* Device minor number */
@@ -206,7 +206,7 @@ extern const struct file_operations g_nxterm_drvrops;
****************************************************************************/
/* Semaphore helpers */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int nxterm_semwait(FAR struct nxterm_state_s *priv);
int nxterm_sempost(FAR struct nxterm_state_s *priv);
#else
diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c
index 3ffb75b01df..f23b5ac16f7 100644
--- a/graphics/nxterm/nxterm_kbdin.c
+++ b/graphics/nxterm/nxterm_kbdin.c
@@ -337,7 +337,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
struct pollfd **slot = (struct pollfd **)fds->priv;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
gdbg("ERROR: No slot\n");
diff --git a/graphics/nxterm/nxterm_register.c b/graphics/nxterm/nxterm_register.c
index a0751773d7a..a88d0380551 100644
--- a/graphics/nxterm/nxterm_register.c
+++ b/graphics/nxterm/nxterm_register.c
@@ -99,7 +99,7 @@ FAR struct nxterm_state_s *
memcpy(&priv->wndo, wndo, sizeof(struct nxterm_window_s));
sem_init(&priv->exclsem, 0, 1);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
priv->holder = NO_HOLDER;
#endif
diff --git a/graphics/nxterm/nxterm_sem.c b/graphics/nxterm/nxterm_sem.c
index 3bdbf854104..185ff30adc5 100644
--- a/graphics/nxterm/nxterm_sem.c
+++ b/graphics/nxterm/nxterm_sem.c
@@ -46,7 +46,7 @@
#include "nxterm.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Pre-processor Definitions
@@ -126,4 +126,4 @@ int nxterm_sempost(FAR struct nxterm_state_s *priv)
return sem_post(&priv->exclsem);
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/graphics/vnc/server/Kconfig b/graphics/vnc/server/Kconfig
index 157b62dfc91..bab68706d18 100644
--- a/graphics/vnc/server/Kconfig
+++ b/graphics/vnc/server/Kconfig
@@ -130,7 +130,7 @@ config VNCSERVER_INBUFFER_SIZE
config VNCSERVER_DEBUG
bool "VNC Server debug"
default n
- depends on DEBUG && !DEBUG_GRAPHICS
+ depends on DEBUG_FEATURES && !DEBUG_GRAPHICS
---help---
Normally VNC debug output is selected with DEBUG_GRAPHICS. The VNC
server server suupport this special option to enable GRAPHICS debug
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index aa71ebd5ffc..3c4fe081339 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -45,10 +45,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
@@ -580,7 +584,7 @@ static inline int vnc_wait_connect(int display)
result = g_fbstartup[display].result;
if (result != -EBUSY)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (result < 0)
{
DEBUGASSERT(g_vnc_sessions[display] == NULL);
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 1541cf2749c..3e6eae0f58e 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -45,10 +45,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index 4b4ac832090..b3decfd8a3f 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -44,10 +44,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 2344ede7124..a3cc473ba97 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -43,10 +43,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index fa4935f7d49..0be90029c6e 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -44,10 +44,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index 94b993ccd7d..fd795398c31 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -48,10 +48,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index a466740b236..675d36fd4a4 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -48,10 +48,14 @@
#include
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-# undef CONFIG_DEBUG
+# undef CONFIG_DEBUG_FEATURES
+# undef CONFIG_DEBUG_ERROR
+# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_INFO 1
+# define CONFIG_DEBUG_FEATURES 1
+# define CONFIG_DEBUG_ERROR 1
+# define CONFIG_DEBUG_WARN 1
+# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/include/debug.h b/include/debug.h
index 80d175ed309..b2810cdc56d 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -81,7 +81,7 @@
* fatal consequences).
*
* [a-z]dbg() -- Identical to [a-z]info() except that it also requires that
- * CONFIG_DEBUG be defined. This is intended for important error-related
+ * CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related
* information that you probably not want to suppress during normal debug
* general debugging.
*
@@ -102,7 +102,7 @@
* fatal consequences).
*
* [a-z]lldbg() -- Identical to [a-z]llinfo() except that it also requires that
- * CONFIG_DEBUG be defined. This is intended for important error-related
+ * CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related
* information that you probably not want to suppress during normal debug
* general debugging.
*/
@@ -132,7 +132,7 @@
/* C-99 style variadic macros are supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define dbg(format, ...) \
__arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
@@ -142,7 +142,7 @@
# else
# define lldbg(x...)
# endif
-#else /* CONFIG_DEBUG */
+#else /* CONFIG_DEBUG_FEATURES */
# define dbg(x...)
# define lldbg(x...)
@@ -424,7 +424,7 @@
/* Variadic macros NOT supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# ifndef CONFIG_ARCH_LOWPUTC
# define lldbg (void)
# endif
@@ -697,7 +697,7 @@
/* Buffer dumping macros do not depend on varargs */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
# ifdef CONFIG_DEBUG_INFO
# define infodumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
@@ -839,13 +839,13 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
*/
#ifndef CONFIG_CPP_HAVE_VARARGS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int dbg(const char *format, ...);
# ifdef CONFIG_ARCH_LOWPUTC
int lldbg(const char *format, ...);
# endif
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
#ifdef CONFIG_DEBUG_WARN
int warn(const char *format, ...);
diff --git a/include/nuttx/analog/pga11x.h b/include/nuttx/analog/pga11x.h
index d95589cdae2..789059504dc 100644
--- a/include/nuttx/analog/pga11x.h
+++ b/include/nuttx/analog/pga11x.h
@@ -73,7 +73,7 @@
* When SPI_SELECT is called with devid=SPIDEV_MUX.
*
* Other settings that effect the driver:
- * CONFIG_DEBUG_SPI -- With CONFIG_DEBUG and CONFIG_DEBUG_INFO,
+ * CONFIG_DEBUG_SPI -- With CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_INFO,
* this will enable debug output from the PGA117 driver.
*/
diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h
index 709b701553d..e955a4618ba 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -67,7 +67,7 @@
****************************************************************************/
/* Configuration ************************************************************/
/* CONFIG_AUDIO - Enables Audio driver support
- * CONFIG_DEBUG_AUDIO - If enabled (with CONFIG_DEBUG and, optionally,
+ * CONFIG_DEBUG_AUDIO - If enabled (with CONFIG_DEBUG_FEATURES and, optionally,
* CONFIG_DEBUG_INFO), this will generate output that can be used to
* debug Audio drivers.
*/
diff --git a/include/nuttx/fs/nxffs.h b/include/nuttx/fs/nxffs.h
index a93a6970568..edbaf190aa0 100644
--- a/include/nuttx/fs/nxffs.h
+++ b/include/nuttx/fs/nxffs.h
@@ -140,7 +140,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd);
* Name: nxffs_dump
*
* Description:
- * Dump a summary of the contents of an NXFFS file system. CONFIG_DEBUG
+ * Dump a summary of the contents of an NXFFS file system. CONFIG_DEBUG_FEATURES
* and CONFIG_DEBUG_FS must be enabled for this function to do anything.
*
* Input Parameters:
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index 0ace9ea3131..08b7e6f3cf9 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -85,7 +85,7 @@
* CONFIG_STMPE811_TEMP_DISABLE
* Disable driver temperature sensor functionality.
* CONFIG_STMPE811_REGDEBUG
- * Enable very low register-level debug output. Requires CONFIG_DEBUG.
+ * Enable very low register-level debug output. Requires CONFIG_DEBUG_FEATURES.
* CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
* STMPE811 touchscreen data comes in a a very high rate. New touch positions
* will only be reported when the X or Y data changes by these thresholds.
@@ -143,7 +143,7 @@
/* Debug output */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_STMPE811_REGDEBUG
#endif
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 7d2e102f318..485e73fbeb4 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -427,7 +427,7 @@ FAR void *kmm_memalign(size_t alignment, size_t size);
/* Functions contained in kmm_heapmember.c **********************************/
-#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG_FEATURES)
bool kmm_heapmember(FAR void *mem);
#endif
diff --git a/include/nuttx/net/iob.h b/include/nuttx/net/iob.h
index b9ff53d78c9..2ac74dceb85 100644
--- a/include/nuttx/net/iob.h
+++ b/include/nuttx/net/iob.h
@@ -410,7 +410,7 @@ int iob_contig(FAR struct iob_s *iob, unsigned int len);
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
unsigned int offset);
#else
diff --git a/include/nuttx/pwm.h b/include/nuttx/pwm.h
index 24d2e6980d9..78369a793b7 100644
--- a/include/nuttx/pwm.h
+++ b/include/nuttx/pwm.h
@@ -72,7 +72,7 @@
* number of pulses. This might be used, for example to support a stepper
* motor. If the hardware will support a fixed pulse count, then this
* configuration should be set to enable the capability.
- * CONFIG_DEBUG_PWM - If enabled (with CONFIG_DEBUG and, optionally,
+ * CONFIG_DEBUG_PWM - If enabled (with CONFIG_DEBUG_FEATURES and, optionally,
* CONFIG_DEBUG_INFO), this will generate output that can be use dto
* debug the PWM driver.
*/
diff --git a/include/nuttx/sensors/adxl345.h b/include/nuttx/sensors/adxl345.h
index da563c8ac60..59df6c9dad9 100644
--- a/include/nuttx/sensors/adxl345.h
+++ b/include/nuttx/sensors/adxl345.h
@@ -66,7 +66,7 @@
* going high, it will start high and will go low when an interrupt
* is fired. Default: Active high/rising edge.
* CONFIG_ADXL345_REGDEBUG
- * Enable very low register-level debug output. Requires CONFIG_DEBUG.
+ * Enable very low register-level debug output. Requires CONFIG_DEBUG_FEATURES.
*/
#ifdef CONFIG_DISABLE_SIGNALS
diff --git a/include/nuttx/sensors/bmp180.h b/include/nuttx/sensors/bmp180.h
index 0c12e242265..9a2d21d839d 100644
--- a/include/nuttx/sensors/bmp180.h
+++ b/include/nuttx/sensors/bmp180.h
@@ -52,7 +52,7 @@
* CONFIG_BMP180
* Enables support for the BMP180 driver
* CONFIG_BMP180_REGDEBUG
- * Enable very low register-level debug output. Requires CONFIG_DEBUG.
+ * Enable very low register-level debug output. Requires CONFIG_DEBUG_FEATURES.
*/
/****************************************************************************
diff --git a/include/nuttx/sensors/mpl115a.h b/include/nuttx/sensors/mpl115a.h
index c958c8025df..736922d968e 100644
--- a/include/nuttx/sensors/mpl115a.h
+++ b/include/nuttx/sensors/mpl115a.h
@@ -49,7 +49,7 @@
* CONFIG_SENSORS_MPL115A
* Enables support for the MPL115A driver
* CONFIG_MPL115A_REGDEBUG
- * Enable very low register-level debug output. Requires CONFIG_DEBUG.
+ * Enable very low register-level debug output. Requires CONFIG_DEBUG_FEATURES.
*/
/* There are two types of MPL115A chips. The MPL115A1 communicates with the target CPU
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index 9e424b5aa26..0c5f8523761 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -69,7 +69,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 95b1a85538c..8debf102112 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -56,7 +56,7 @@
* include/debug.h
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
#endif
diff --git a/include/nuttx/timers/cs2100-cp.h b/include/nuttx/timers/cs2100-cp.h
index fe72836770b..51fe48974da 100644
--- a/include/nuttx/timers/cs2100-cp.h
+++ b/include/nuttx/timers/cs2100-cp.h
@@ -60,7 +60,7 @@
# define CONFIG_TIMERS_CS2100CP_CLKINBW 16
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_CS2100CP_DEBUG
# undef CONFIG_CS2100CP_REGDEBUG
#endif
diff --git a/include/nuttx/usb/usbdev_trace.h b/include/nuttx/usb/usbdev_trace.h
index 445ef5f560a..4ef4e170e11 100644
--- a/include/nuttx/usb/usbdev_trace.h
+++ b/include/nuttx/usb/usbdev_trace.h
@@ -480,7 +480,7 @@ EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[];
*
****************************************************************************/
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
#else
# define usbtrace_enable(idset)
@@ -497,7 +497,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
*
****************************************************************************/
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
void usbtrace(uint16_t event, uint16_t value);
#else
# define usbtrace(event, value)
diff --git a/include/nuttx/usb/usbhost_trace.h b/include/nuttx/usb/usbhost_trace.h
index 5351cb090e6..f71b7c90b80 100644
--- a/include/nuttx/usb/usbhost_trace.h
+++ b/include/nuttx/usb/usbhost_trace.h
@@ -48,7 +48,7 @@
/* Configuration ************************************************************/
/* Debug/Trace-related definitions */
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_USB
# undef CONFIG_DEBUG_INFO
#endif
@@ -115,7 +115,7 @@ extern "C"
*
****************************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_USB
#endif
diff --git a/include/spawn.h b/include/spawn.h
index 19b0c245016..f2d49f04107 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -186,7 +186,7 @@ int posix_spawn_file_actions_addopen(FAR posix_spawn_file_actions_t *file_action
int posix_spawnattr_init(FAR posix_spawnattr_t *attr);
/* int posix_spawnattr_destroy(FAR posix_spawnattr_t *); */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define posix_spawnattr_destroy(attr) (attr ? 0 : EINVAL)
#else
# define posix_spawnattr_destroy(attr) (0)
@@ -234,7 +234,7 @@ int task_spawnattr_setstacksize(FAR posix_spawnattr_t *attr,
/* Non standard debug functions */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions);
void posix_spawnattr_dump(FAR posix_spawnattr_t *attr);
#else
diff --git a/libc/libc.csv b/libc/libc.csv
index cf68eaf776e..87a98f778db 100644
--- a/libc/libc.csv
+++ b/libc/libc.csv
@@ -18,7 +18,6 @@
"chdir","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *"
"crc32","crc32.h","","uint32_t","FAR const uint8_t *","size_t"
"crc32part","crc32.h","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
-"dbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG)","int","const char *","..."
"dirname","libgen.h","","FAR char","FAR char *"
"dq_addafter","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
"dq_addbefore","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
@@ -27,6 +26,7 @@
"dq_rem","queue.h","","void","FAR dq_entry_t *","dq_queue_t *"
"dq_remfirst","queue.h","","FAR dq_entry_t","dq_queue_t *"
"dq_remlast","queue.h","","FAR dq_entry_t","dq_queue_t *"
+"err","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR)","int","const char *","..."
"ether_ntoa","netinet/ether.h","","FAR char","FAR const struct ether_addr *"
"fclose","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
"fdopen","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","int","FAR const char *"
@@ -64,8 +64,9 @@
"lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int"
"lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *"
"llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int"
-"lldbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
-"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
"lowsyslog","syslog.h","","int","int","FAR const char *","..."
"lowvsyslog","syslog.h","","int","int","FAR const char *","va_list"
"match","nuttx/regex.h","","int","const char *","const char *"
@@ -168,10 +169,11 @@
"ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t"
"ungetc","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *"
"usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR FILE *"
-"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
+"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
"vfprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list"
"vprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list"
"vsnprintf","stdio.h","","int","FAR char *","size_t","const char *","va_list"
"vsprintf","stdio.h","","int","FAR char *","const char *","va_list"
"vsscanf","stdio.h","","int","char *","const char *","va_list"
"vsyslog","syslog.h","","int","int","FAR const char *","va_list"
+"warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN)","int","const char *","..."
diff --git a/libc/misc/Make.defs b/libc/misc/Make.defs
index 45f3705a283..6fa349e0f9c 100644
--- a/libc/misc/Make.defs
+++ b/libc/misc/Make.defs
@@ -78,7 +78,7 @@ endif
CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc8.c
CSRCS += lib_dumpbuffer.c lib_match.c
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += lib_dbg.c
endif
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index ba9bec63eaf..219b1ec79ca 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -59,7 +59,7 @@
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
int dbg(const char *format, ...)
{
va_list ap;
@@ -85,7 +85,7 @@ int lldbg(const char *format, ...)
return ret;
}
#endif /* CONFIG_ARCH_LOWPUTC */
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
#ifdef CONFIG_DEBUG_WARN
int warn(const char *format, ...)
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index 92e11a297c2..2f8cdaa73eb 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -57,7 +57,7 @@
* debug must also be enabled.
*/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/libc/spawn/Make.defs b/libc/spawn/Make.defs
index 7b4fdba4ce6..3581193f677 100644
--- a/libc/spawn/Make.defs
+++ b/libc/spawn/Make.defs
@@ -38,7 +38,7 @@
CSRCS += lib_psfa_addaction.c lib_psfa_addclose.c lib_psfa_adddup2.c
CSRCS += lib_psfa_addopen.c lib_psfa_destroy.c lib_psfa_init.c
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += lib_psfa_dump.c
endif
@@ -54,7 +54,7 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
CSRCS += lib_psa_getstacksize.c lib_psa_setstacksize.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += lib_psa_dump.c
endif
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index 935de174ed2..0afd087dee3 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -42,7 +42,7 @@
#include
#include
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Public Functions
@@ -124,4 +124,4 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr)
#endif
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/libc/spawn/lib_psfa_dump.c b/libc/spawn/lib_psfa_dump.c
index 45ca67107a0..fe6fd0c2760 100644
--- a/libc/spawn/lib_psfa_dump.c
+++ b/libc/spawn/lib_psfa_dump.c
@@ -45,7 +45,7 @@
#include
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Public Functions
@@ -126,5 +126,5 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
}
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/libc/stdio/lib_fgetpos.c b/libc/stdio/lib_fgetpos.c
index ba4fa478b27..deca7e44550 100644
--- a/libc/stdio/lib_fgetpos.c
+++ b/libc/stdio/lib_fgetpos.c
@@ -104,7 +104,7 @@ int fgetpos(FAR FILE *stream, FAR fpos_t *pos)
{
long position;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!stream || !pos)
{
set_errno(EINVAL);
diff --git a/libc/stdio/lib_fputs.c b/libc/stdio/lib_fputs.c
index 4b47a046288..1d66c269d35 100644
--- a/libc/stdio/lib_fputs.c
+++ b/libc/stdio/lib_fputs.c
@@ -104,7 +104,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
/* Make sure that a string was provided. */
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
if (!s)
{
set_errno(EINVAL);
@@ -149,7 +149,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
/* Make sure that a string was provided. */
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
if (!s)
{
set_errno(EINVAL);
@@ -192,7 +192,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
/* Make sure that a string was provided. */
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
if (!s)
{
set_errno(EINVAL);
diff --git a/libc/stdio/lib_fsetpos.c b/libc/stdio/lib_fsetpos.c
index 18843cb6f7e..faa7324cde1 100644
--- a/libc/stdio/lib_fsetpos.c
+++ b/libc/stdio/lib_fsetpos.c
@@ -104,7 +104,7 @@
int fsetpos(FAR FILE *stream, FAR fpos_t *pos)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!stream || !pos)
{
set_errno(EINVAL);
diff --git a/libc/stdio/lib_wrflush.c b/libc/stdio/lib_wrflush.c
index b07c48b2904..ad562f128dc 100644
--- a/libc/stdio/lib_wrflush.c
+++ b/libc/stdio/lib_wrflush.c
@@ -91,7 +91,7 @@ int lib_wrflush(FAR FILE *stream)
#if CONFIG_STDIO_BUFFER_SIZE > 0
/* Verify that we were passed a valid (i.e., non-NULL) stream */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!stream)
{
return -EINVAL;
@@ -122,7 +122,7 @@ int lib_wrflush(FAR FILE *stream)
#else
/* Verify that we were passed a valid (i.e., non-NULL) stream */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!stream)
{
return -EINVAL;
diff --git a/libc/string/lib_strpbrk.c b/libc/string/lib_strpbrk.c
index 4170926bb68..f01b5a148b3 100644
--- a/libc/string/lib_strpbrk.c
+++ b/libc/string/lib_strpbrk.c
@@ -49,7 +49,7 @@ FAR char *strpbrk(FAR const char *str, FAR const char *charset)
{
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!str || !charset)
{
return NULL;
diff --git a/libc/time/lib_gettimeofday.c b/libc/time/lib_gettimeofday.c
index d1315b12888..6a1f01d16ed 100644
--- a/libc/time/lib_gettimeofday.c
+++ b/libc/time/lib_gettimeofday.c
@@ -75,7 +75,7 @@ int gettimeofday(FAR struct timeval *tv, FAR struct timezone *tz)
struct timespec ts;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!tv)
{
set_errno(EINVAL);
diff --git a/libc/time/lib_settimeofday.c b/libc/time/lib_settimeofday.c
index ea404b7e039..a36f32911bd 100644
--- a/libc/time/lib_settimeofday.c
+++ b/libc/time/lib_settimeofday.c
@@ -73,7 +73,7 @@ int settimeofday(FAR const struct timeval *tv, FAR struct timezone *tz)
{
struct timespec ts;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!tv || tv->tv_usec >= USEC_PER_SEC)
{
set_errno(EINVAL);
diff --git a/libc/unistd/lib_getcwd.c b/libc/unistd/lib_getcwd.c
index 851d380fb6c..55587a599e2 100644
--- a/libc/unistd/lib_getcwd.c
+++ b/libc/unistd/lib_getcwd.c
@@ -99,7 +99,7 @@ FAR char *getcwd(FAR char *buf, size_t size)
/* Verify input parameters */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!buf || !size)
{
set_errno(EINVAL);
diff --git a/libnx/nx/nx_drawline.c b/libnx/nx/nx_drawline.c
index 49046be94b0..6ca0ade436e 100644
--- a/libnx/nx/nx_drawline.c
+++ b/libnx/nx/nx_drawline.c
@@ -99,7 +99,7 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
struct nxgl_rect_s rect;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !vector || width < 1 || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_bitmap.c b/libnx/nxmu/nx_bitmap.c
index 6ed0096b7b6..8526e92f290 100644
--- a/libnx/nxmu/nx_bitmap.c
+++ b/libnx/nxmu/nx_bitmap.c
@@ -102,7 +102,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
int ret;
sem_t sem_done;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !dest || !src || !origin)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_block.c b/libnx/nxmu/nx_block.c
index 56b66f23a9f..eb4cb41fd9d 100644
--- a/libnx/nxmu/nx_block.c
+++ b/libnx/nxmu/nx_block.c
@@ -107,7 +107,7 @@ int nx_block(NXWINDOW hwnd, FAR void *arg)
struct nxsvrmsg_blocked_s outmsg;
int ret = OK;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_connect.c b/libnx/nxmu/nx_connect.c
index 07cf7a75147..540bf698f72 100644
--- a/libnx/nxmu/nx_connect.c
+++ b/libnx/nxmu/nx_connect.c
@@ -122,7 +122,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!svrmqname)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_constructwindow.c b/libnx/nxmu/nx_constructwindow.c
index 677706e1856..32f47880d57 100644
--- a/libnx/nxmu/nx_constructwindow.c
+++ b/libnx/nxmu/nx_constructwindow.c
@@ -108,7 +108,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_openwindow_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_fill.c b/libnx/nxmu/nx_fill.c
index 263431b064a..93c8c613ca7 100644
--- a/libnx/nxmu/nx_fill.c
+++ b/libnx/nxmu/nx_fill.c
@@ -94,7 +94,7 @@ int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_fill_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_filltrapezoid.c b/libnx/nxmu/nx_filltrapezoid.c
index 374d86614ed..04f69320acf 100644
--- a/libnx/nxmu/nx_filltrapezoid.c
+++ b/libnx/nxmu/nx_filltrapezoid.c
@@ -99,7 +99,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
/* Some debug-only sanity checks */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !trap || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_getposition.c b/libnx/nxmu/nx_getposition.c
index 19fee248ff9..ff3f7723f37 100644
--- a/libnx/nxmu/nx_getposition.c
+++ b/libnx/nxmu/nx_getposition.c
@@ -91,7 +91,7 @@ int nx_getposition(NXWINDOW hwnd)
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_getposition_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c
index 4c6f2d22e28..737831e9a4c 100644
--- a/libnx/nxmu/nx_getrectangle.c
+++ b/libnx/nxmu/nx_getrectangle.c
@@ -101,7 +101,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
int ret;
sem_t sem_done;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !rect || !dest)
{
ginfo("Invalid parameters\n");
diff --git a/libnx/nxmu/nx_move.c b/libnx/nxmu/nx_move.c
index 19d36703ecd..d62d680df55 100644
--- a/libnx/nxmu/nx_move.c
+++ b/libnx/nxmu/nx_move.c
@@ -92,7 +92,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_move_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_openwindow.c b/libnx/nxmu/nx_openwindow.c
index 5100a3b9a50..a704c424961 100644
--- a/libnx/nxmu/nx_openwindow.c
+++ b/libnx/nxmu/nx_openwindow.c
@@ -95,7 +95,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxbe_window_s *wnd;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!handle || !cb)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_releasebkgd.c b/libnx/nxmu/nx_releasebkgd.c
index 3bad1b265da..ca51f5e92eb 100644
--- a/libnx/nxmu/nx_releasebkgd.c
+++ b/libnx/nxmu/nx_releasebkgd.c
@@ -90,7 +90,7 @@ int nx_releasebkgd(NXWINDOW hwnd)
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_releasebkgd_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_requestbkgd.c b/libnx/nxmu/nx_requestbkgd.c
index 20f217d0849..b1f3e68028c 100644
--- a/libnx/nxmu/nx_requestbkgd.c
+++ b/libnx/nxmu/nx_requestbkgd.c
@@ -116,7 +116,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
struct nxsvrmsg_requestbkgd_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !cb)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setbgcolor.c b/libnx/nxmu/nx_setbgcolor.c
index ac3afe48a29..78599edb2ba 100644
--- a/libnx/nxmu/nx_setbgcolor.c
+++ b/libnx/nxmu/nx_setbgcolor.c
@@ -90,7 +90,7 @@ int nx_setbgcolor(NXHANDLE handle,
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
struct nxsvrmsg_setbgcolor_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setpixel.c b/libnx/nxmu/nx_setpixel.c
index fef16c05357..5c973bec71b 100644
--- a/libnx/nxmu/nx_setpixel.c
+++ b/libnx/nxmu/nx_setpixel.c
@@ -95,7 +95,7 @@ int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_setpixel_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !pos || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setposition.c b/libnx/nxmu/nx_setposition.c
index 10568595a6c..7ca0d02baf3 100644
--- a/libnx/nxmu/nx_setposition.c
+++ b/libnx/nxmu/nx_setposition.c
@@ -90,7 +90,7 @@ int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos)
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_setposition_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !pos)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setsize.c b/libnx/nxmu/nx_setsize.c
index 948ace43077..b1cbb1086aa 100644
--- a/libnx/nxmu/nx_setsize.c
+++ b/libnx/nxmu/nx_setsize.c
@@ -90,7 +90,7 @@ int nx_setsize(NXWINDOW hwnd, FAR const struct nxgl_size_s *size)
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_setsize_s outmsg;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !size)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nxmu_sendserver.c b/libnx/nxmu/nxmu_sendserver.c
index 0281903980d..0b93809a66e 100644
--- a/libnx/nxmu/nxmu_sendserver.c
+++ b/libnx/nxmu/nxmu_sendserver.c
@@ -92,7 +92,7 @@ int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg,
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !conn->cwrmq)
{
set_errno(EINVAL);
diff --git a/libnx/nxmu/nxmu_sendwindow.c b/libnx/nxmu/nxmu_sendwindow.c
index f240c5614f6..ff279d86ac1 100644
--- a/libnx/nxmu/nxmu_sendwindow.c
+++ b/libnx/nxmu/nxmu_sendwindow.c
@@ -94,7 +94,7 @@ int nxmu_sendwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
/* Sanity checking */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !wnd->conn)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_bitmaptoolbar.c b/libnx/nxtk/nxtk_bitmaptoolbar.c
index abc1815b8f7..6f31d930099 100644
--- a/libnx/nxtk/nxtk_bitmaptoolbar.c
+++ b/libnx/nxtk/nxtk_bitmaptoolbar.c
@@ -102,7 +102,7 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
struct nxgl_point_s wndorigin;
struct nxgl_rect_s clipdest;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !dest || !src || !origin)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_bitmapwindow.c b/libnx/nxtk/nxtk_bitmapwindow.c
index 59a8776b626..0371715ba7c 100644
--- a/libnx/nxtk/nxtk_bitmapwindow.c
+++ b/libnx/nxtk/nxtk_bitmapwindow.c
@@ -102,7 +102,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
struct nxgl_point_s wndorigin;
struct nxgl_rect_s clipdest;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !dest || !src || !origin)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_drawlinetoolbar.c b/libnx/nxtk/nxtk_drawlinetoolbar.c
index bd7744725e0..84d25ad83ca 100644
--- a/libnx/nxtk/nxtk_drawlinetoolbar.c
+++ b/libnx/nxtk/nxtk_drawlinetoolbar.c
@@ -102,7 +102,7 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
struct nxgl_rect_s rect;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !vector || width < 1 || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_drawlinewindow.c b/libnx/nxtk/nxtk_drawlinewindow.c
index a616ce13205..231842b8828 100644
--- a/libnx/nxtk/nxtk_drawlinewindow.c
+++ b/libnx/nxtk/nxtk_drawlinewindow.c
@@ -101,7 +101,7 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
struct nxgl_rect_s rect;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !vector || width < 1 || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltoolbar.c b/libnx/nxtk/nxtk_filltoolbar.c
index 0d62eaaf84e..25eb6a8e8e8 100644
--- a/libnx/nxtk/nxtk_filltoolbar.c
+++ b/libnx/nxtk/nxtk_filltoolbar.c
@@ -94,7 +94,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s fillrect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltraptoolbar.c b/libnx/nxtk/nxtk_filltraptoolbar.c
index 1b7ae272770..3ca0b38ad23 100644
--- a/libnx/nxtk/nxtk_filltraptoolbar.c
+++ b/libnx/nxtk/nxtk_filltraptoolbar.c
@@ -95,7 +95,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd,
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s relclip;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !trap || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltrapwindow.c b/libnx/nxtk/nxtk_filltrapwindow.c
index bbfba26599e..88c3077223f 100644
--- a/libnx/nxtk/nxtk_filltrapwindow.c
+++ b/libnx/nxtk/nxtk_filltrapwindow.c
@@ -96,7 +96,7 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
struct nxgl_rect_s relclip;
struct nxgl_trapezoid_s reltrap;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !trap || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_fillwindow.c b/libnx/nxtk/nxtk_fillwindow.c
index fa0fd8d8f24..9ff1caca57e 100644
--- a/libnx/nxtk/nxtk_fillwindow.c
+++ b/libnx/nxtk/nxtk_fillwindow.c
@@ -94,7 +94,7 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s fillrect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !color)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_gettoolbar.c b/libnx/nxtk/nxtk_gettoolbar.c
index 3626462dad4..bc05cbce942 100644
--- a/libnx/nxtk/nxtk_gettoolbar.c
+++ b/libnx/nxtk/nxtk_gettoolbar.c
@@ -100,7 +100,7 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s getrect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !dest)
{
ginfo("Invalid parameters\n");
diff --git a/libnx/nxtk/nxtk_getwindow.c b/libnx/nxtk/nxtk_getwindow.c
index ffb06bf95d1..4106267fb0c 100644
--- a/libnx/nxtk/nxtk_getwindow.c
+++ b/libnx/nxtk/nxtk_getwindow.c
@@ -100,7 +100,7 @@ int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s getrect;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !dest)
{
ginfo("Invalid parameters\n");
diff --git a/libnx/nxtk/nxtk_movetoolbar.c b/libnx/nxtk/nxtk_movetoolbar.c
index 62d14e7bf85..913142a0d4a 100644
--- a/libnx/nxtk/nxtk_movetoolbar.c
+++ b/libnx/nxtk/nxtk_movetoolbar.c
@@ -99,7 +99,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
struct nxgl_rect_s srcrect;
struct nxgl_point_s clipoffset;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !offset)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_movewindow.c b/libnx/nxtk/nxtk_movewindow.c
index 2b34f44a8b6..302cff98d1d 100644
--- a/libnx/nxtk/nxtk_movewindow.c
+++ b/libnx/nxtk/nxtk_movewindow.c
@@ -98,7 +98,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
struct nxgl_rect_s srcrect;
struct nxgl_point_s clipoffset;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !rect || !offset)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_opentoolbar.c b/libnx/nxtk/nxtk_opentoolbar.c
index 26aa4c504f7..f5d58979eaa 100644
--- a/libnx/nxtk/nxtk_opentoolbar.c
+++ b/libnx/nxtk/nxtk_opentoolbar.c
@@ -96,7 +96,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
{
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !cb)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_openwindow.c b/libnx/nxtk/nxtk_openwindow.c
index 796a57d3b70..ebefaec8920 100644
--- a/libnx/nxtk/nxtk_openwindow.c
+++ b/libnx/nxtk/nxtk_openwindow.c
@@ -120,7 +120,7 @@ NXTKWINDOW nxtk_openwindow(NXHANDLE handle,
FAR struct nxtk_framedwindow_s *fwnd;
int ret;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!handle || !cb)
{
set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_setsize.c b/libnx/nxtk/nxtk_setsize.c
index 8848c717200..7e907969664 100644
--- a/libnx/nxtk/nxtk_setsize.c
+++ b/libnx/nxtk/nxtk_setsize.c
@@ -94,7 +94,7 @@ int nxtk_setsize(NXTKWINDOW hfwnd, FAR const struct nxgl_size_s *size)
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_size_s newsize;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!hfwnd || !size)
{
set_errno(EINVAL);
diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx
index a4575519ab4..290933883c2 100644
--- a/libxx/libxx_new.cxx
+++ b/libxx/libxx_new.cxx
@@ -87,7 +87,7 @@ void *operator new(unsigned int nbytes)
void *alloc = lib_malloc(nbytes);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (alloc == 0)
{
// Oh my.. we are required to return a valid pointer and
diff --git a/libxx/libxx_newa.cxx b/libxx/libxx_newa.cxx
index c1e4dfa95d9..7b909dad42c 100644
--- a/libxx/libxx_newa.cxx
+++ b/libxx/libxx_newa.cxx
@@ -87,7 +87,7 @@ void *operator new[](unsigned int nbytes)
void *alloc = lib_malloc(nbytes);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (alloc == 0)
{
// Oh my.. we are required to return a valid pointer and
diff --git a/mm/Kconfig b/mm/Kconfig
index 1f0a79f0de7..8cba9265ea9 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -116,7 +116,7 @@ config GRAN_INTR
config DEBUG_GRAN
bool "Granule Allocator Debug"
default n
- depends on GRAN && DEBUG
+ depends on GRAN && DEBUG_FEATURES
---help---
Just like DEBUG_MM, but only generates output from the gran
allocation logic.
@@ -143,7 +143,7 @@ config MM_PGSIZE
config DEBUG_PGALLOC
bool "Page Allocator Debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Just like DEBUG_MM, but only generates output from the page
allocation logic.
diff --git a/mm/kmm_heap/Make.defs b/mm/kmm_heap/Make.defs
index cf7053e54b5..9f7ac447a3e 100644
--- a/mm/kmm_heap/Make.defs
+++ b/mm/kmm_heap/Make.defs
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
CSRCS += kmm_sbrk.c
endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += kmm_heapmember.c
endif
diff --git a/mm/kmm_heap/kmm_heapmember.c b/mm/kmm_heap/kmm_heapmember.c
index b96a6f7ada7..53fa7027b7d 100644
--- a/mm/kmm_heap/kmm_heapmember.c
+++ b/mm/kmm_heap/kmm_heapmember.c
@@ -43,7 +43,7 @@
#include
-#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG_FEATURES)
/****************************************************************************
* Public Functions
@@ -105,4 +105,4 @@ bool kmm_heapmember(FAR void *mem)
#endif
}
-#endif /* CONFIG_MM_KERNEL_HEAP && CONFIG_DEBUG */
+#endif /* CONFIG_MM_KERNEL_HEAP && CONFIG_DEBUG_FEATURES */
diff --git a/mm/kmm_heap/kmm_kernel.c b/mm/kmm_heap/kmm_kernel.c
index 4a2231dd01f..e2fc9232b81 100644
--- a/mm/kmm_heap/kmm_kernel.c
+++ b/mm/kmm_heap/kmm_kernel.c
@@ -66,7 +66,7 @@
*
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
bool kmm_heapmember(FAR void *mem)
{
#if CONFIG_MM_REGIONS > 1
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index ae00b0b80fe..0cbe1b4e61f 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -53,7 +53,7 @@
//#define MONITOR_MM_SEMAPHORE 1
#ifdef MONITOR_MM_SEMAPHORE
-# ifdef CONFIG_DEBUG
+# ifdef CONFIG_DEBUG_FEATURES
# include
# define msemdbg dbg
# else
@@ -186,7 +186,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
void mm_givesemaphore(FAR struct mm_heap_s *heap)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
pid_t my_pid = getpid();
#endif
@@ -207,7 +207,7 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
{
/* Nope, this is the last reference I have */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
msemdbg("PID=%d giving\n", my_pid);
#endif
diff --git a/net/arp/Kconfig b/net/arp/Kconfig
index df228db6b71..3004ab943e5 100644
--- a/net/arp/Kconfig
+++ b/net/arp/Kconfig
@@ -65,7 +65,7 @@ endif # NET_ARP_SEND
config NET_ARP_DUMP
bool "Dump ARP packet header"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
Dump ARP packets to the SYSLOG device.
diff --git a/net/arp/arp.h b/net/arp/arp.h
index ba62f7893b1..0b95c4abd3e 100644
--- a/net/arp/arp.h
+++ b/net/arp/arp.h
@@ -64,7 +64,7 @@
****************************************************************************/
/* Configuration ************************************************************/
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_NET_ARP_DUMP
#endif
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index 4db178e425f..6923bd6b1c7 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -86,7 +86,7 @@ static void devif_callback_free(FAR struct net_driver_s *dev,
{
save = net_lock();
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/* Check for double freed callbacks */
curr = g_cbfreelist;
@@ -257,7 +257,7 @@ FAR struct devif_callback_s *
*list = ret;
}
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
nlldbg("Failed to allocate callback\n");
diff --git a/net/iob/Kconfig b/net/iob/Kconfig
index e6018d64263..a5cec7e1178 100644
--- a/net/iob/Kconfig
+++ b/net/iob/Kconfig
@@ -63,7 +63,7 @@ config IOB_THROTTLE
config IOB_DEBUG
bool "Force I/O buffer debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
---help---
This option will force debug output from I/O buffer logic,
even without network debug output. This is not normally something
diff --git a/net/iob/Make.defs b/net/iob/Make.defs
index 27827cff498..7f5f1d665b3 100644
--- a/net/iob/Make.defs
+++ b/net/iob/Make.defs
@@ -43,7 +43,7 @@ NET_CSRCS += iob_free_chain.c iob_free_qentry.c iob_free_queue.c
NET_CSRCS += iob_initialize.c iob_pack.c iob_peek_queue.c iob_remove_queue.c
NET_CSRCS += iob_trimhead.c iob_trimhead_queue.c iob_trimtail.c
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
NET_CSRCS += iob_dump.c
endif
diff --git a/net/iob/iob_add_queue.c b/net/iob/iob_add_queue.c
index bc7e0adb8e4..d749c562761 100644
--- a/net/iob/iob_add_queue.c
+++ b/net/iob/iob_add_queue.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_alloc.c b/net/iob/iob_alloc.c
index e5483a2c3e6..4b43320fcd7 100644
--- a/net/iob/iob_alloc.c
+++ b/net/iob/iob_alloc.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_alloc_qentry.c b/net/iob/iob_alloc_qentry.c
index c1a9f54a973..5ba2e6205a0 100644
--- a/net/iob/iob_alloc_qentry.c
+++ b/net/iob/iob_alloc_qentry.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_clone.c b/net/iob/iob_clone.c
index db29abde242..73ccd81893f 100644
--- a/net/iob/iob_clone.c
+++ b/net/iob/iob_clone.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_concat.c b/net/iob/iob_concat.c
index b543d63e6cc..99fff8e75a8 100644
--- a/net/iob/iob_concat.c
+++ b/net/iob/iob_concat.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_contig.c b/net/iob/iob_contig.c
index 749e72a0c76..8817d7de618 100644
--- a/net/iob/iob_contig.c
+++ b/net/iob/iob_contig.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_copyin.c b/net/iob/iob_copyin.c
index e671dc2b5ea..4c2205cd7e2 100644
--- a/net/iob/iob_copyin.c
+++ b/net/iob/iob_copyin.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_copyout.c b/net/iob/iob_copyout.c
index 2cb0a10be62..b250cc5601d 100644
--- a/net/iob/iob_copyout.c
+++ b/net/iob/iob_copyout.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_dump.c b/net/iob/iob_dump.c
index a34dc1ca2ae..78fd87a72c1 100644
--- a/net/iob/iob_dump.c
+++ b/net/iob/iob_dump.c
@@ -44,7 +44,7 @@
#include
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Pre-processor definitions
@@ -162,4 +162,4 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
}
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/net/iob/iob_free.c b/net/iob/iob_free.c
index 7762201b3c9..67a3016088f 100644
--- a/net/iob/iob_free.c
+++ b/net/iob/iob_free.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_chain.c b/net/iob/iob_free_chain.c
index 810622e8288..6f5d4d4ba12 100644
--- a/net/iob/iob_free_chain.c
+++ b/net/iob/iob_free_chain.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_qentry.c b/net/iob/iob_free_qentry.c
index e663d8a2ea2..66cccb99471 100644
--- a/net/iob/iob_free_qentry.c
+++ b/net/iob/iob_free_qentry.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_queue.c b/net/iob/iob_free_queue.c
index 91ded4f42c4..5a4a52513df 100644
--- a/net/iob/iob_free_queue.c
+++ b/net/iob/iob_free_queue.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_initialize.c b/net/iob/iob_initialize.c
index d63d957219f..9bae90b0e43 100644
--- a/net/iob/iob_initialize.c
+++ b/net/iob/iob_initialize.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_pack.c b/net/iob/iob_pack.c
index 660b31d4a85..2df9300ece1 100644
--- a/net/iob/iob_pack.c
+++ b/net/iob/iob_pack.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_peek_queue.c b/net/iob/iob_peek_queue.c
index c49fb1ecbf9..3422d65d60c 100644
--- a/net/iob/iob_peek_queue.c
+++ b/net/iob/iob_peek_queue.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_remove_queue.c b/net/iob/iob_remove_queue.c
index e134bcd0160..4d8a45a3814 100644
--- a/net/iob/iob_remove_queue.c
+++ b/net/iob/iob_remove_queue.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimhead.c b/net/iob/iob_trimhead.c
index 1262eecf09f..ce4f642588c 100644
--- a/net/iob/iob_trimhead.c
+++ b/net/iob/iob_trimhead.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimhead_queue.c b/net/iob/iob_trimhead_queue.c
index 24b98783215..791892d7380 100644
--- a/net/iob/iob_trimhead_queue.c
+++ b/net/iob/iob_trimhead_queue.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c
index 4ca94079571..f89cdeee229 100644
--- a/net/iob/iob_trimtail.c
+++ b/net/iob/iob_trimtail.c
@@ -39,7 +39,7 @@
#include
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/socket/getsockname.c b/net/socket/getsockname.c
index b6b8eebcee8..09c8fa0e65a 100644
--- a/net/socket/getsockname.c
+++ b/net/socket/getsockname.c
@@ -365,7 +365,7 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
* system (?)
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!addr || !addrlen)
{
err = EINVAL;
diff --git a/net/socket/net_sockets.c b/net/socket/net_sockets.c
index 31274117c73..ceac793ee8b 100644
--- a/net/socket/net_sockets.c
+++ b/net/socket/net_sockets.c
@@ -201,7 +201,7 @@ int sockfd_allocate(int minsd)
void sock_release(FAR struct socket *psock)
{
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (psock)
#endif
{
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index fc9d8c794d1..d095e19ad8b 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -1848,7 +1848,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
/* Verify that non-NULL pointers were passed */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!buf)
{
err = EINVAL;
diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index fccfba8feab..59fa04d018b 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -107,7 +107,7 @@ config NET_TCP_NWRBCHAINS
config NET_TCP_WRBUFFER_DEBUG
bool "Force write buffer debug"
default n
- depends on DEBUG
+ depends on DEBUG_FEATURES
select IOB_DEBUG
---help---
This option will force debug output from TCP write buffer logic,
diff --git a/net/tcp/Make.defs b/net/tcp/Make.defs
index 9581c626abf..520e601f4c1 100644
--- a/net/tcp/Make.defs
+++ b/net/tcp/Make.defs
@@ -63,7 +63,7 @@ NET_CSRCS += tcp_callback.c tcp_backlog.c tcp_ipselect.c
ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y)
NET_CSRCS += tcp_wrbuffer.c
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
NET_CSRCS += tcp_wrbuffer_dump.c
endif
endif
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 0b3bd37ce57..e95d50cdf4b 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -115,7 +115,7 @@
# define WRB_TRIM(wrb,n) \
do { (wrb)->wb_iob = iob_trimhead((wrb)->wb_iob,(n)); } while (0)
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
# define WRB_DUMP(msg,wrb,len,offset) \
tcp_wrbuffer_dump(msg,wrb,len,offset)
#else
@@ -1251,7 +1251,7 @@ int tcp_wrbuffer_test(void);
****************************************************************************/
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
void tcp_wrbuffer_dump(FAR const char *msg, FAR struct tcp_wrbuffer_s *wrb,
unsigned int len, unsigned int offset);
#else
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index 9a1e6e3bf53..1a7d73b8334 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -79,7 +79,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
nllinfo("conn=%p nblg=%d\n", conn, nblg);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
return -EINVAL;
@@ -163,7 +163,7 @@ int tcp_backlogdestroy(FAR struct tcp_conn_s *conn)
nllinfo("conn=%p\n", conn);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
return -EINVAL;
@@ -224,7 +224,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
nllinfo("conn=%p blconn=%p\n", conn, blconn);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
return -EINVAL;
@@ -294,7 +294,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn)
FAR struct tcp_blcontainer_s *blc;
FAR struct tcp_conn_s *blconn = NULL;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
return NULL;
@@ -347,7 +347,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
nllinfo("conn=%p blconn=%p\n", conn, blconn);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn)
{
return -EINVAL;
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index 40a5a34c784..5344eb43039 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -169,7 +169,7 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !fds)
{
return -EINVAL;
@@ -329,7 +329,7 @@ int tcp_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !fds->priv)
{
return -EINVAL;
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 538cb299803..b5c729def9b 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -43,7 +43,7 @@
#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && \
defined(CONFIG_NET_TCP_WRITE_BUFFERS)
-#if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c
index cb6c10e9d8d..1c4dd824fb2 100644
--- a/net/tcp/tcp_wrbuffer.c
+++ b/net/tcp/tcp_wrbuffer.c
@@ -41,7 +41,7 @@
#include
#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_WRITE_BUFFERS)
-#if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
/* Force debug output (from this file only) */
# undef CONFIG_DEBUG_NET
diff --git a/net/tcp/tcp_wrbuffer_dump.c b/net/tcp/tcp_wrbuffer_dump.c
index 5458519195d..2155a3b4751 100644
--- a/net/tcp/tcp_wrbuffer_dump.c
+++ b/net/tcp/tcp_wrbuffer_dump.c
@@ -46,7 +46,7 @@
#include "tcp/tcp.h"
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Public Functions
@@ -68,4 +68,4 @@ void tcp_wrbuffer_dump(FAR const char *msg, FAR struct tcp_wrbuffer_s *wrb,
iob_dump("I/O Buffer Chain", WRB_IOB(wrb), len, offset);
}
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c
index 349560b1cc7..0dc670fe105 100644
--- a/net/udp/udp_netpoll.c
+++ b/net/udp/udp_netpoll.c
@@ -166,7 +166,7 @@ int udp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !fds)
{
return -EINVAL;
@@ -295,7 +295,7 @@ int udp_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
/* Sanity check */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !fds->priv)
{
return -EINVAL;
diff --git a/sched/Kconfig b/sched/Kconfig
index d85be10ce7f..69b4945fd10 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -484,7 +484,7 @@ config PREALLOC_CHILDSTATUS
config DEBUG_CHILDSTATUS
bool "Enable Child Status Debug Output"
default n
- depends on SCHED_CHILD_STATUS && DEBUG
+ depends on SCHED_CHILD_STATUS && DEBUG_FEATURES
---help---
Very detailed... I am sure that you do not want this.
@@ -1013,7 +1013,7 @@ config MODULE_BUFFERINCR
config MODULE_DUMPBUFFER
bool "Dump module buffers"
default n
- depends on DEBUG && CONFIG_DEBUG_INFO
+ depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
---help---
Dump various module buffers for debug purposes
diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c
index 00e78b4322d..065697b482c 100644
--- a/sched/group/group_childstatus.c
+++ b/sched/group/group_childstatus.c
@@ -66,7 +66,7 @@
# define CONFIG_PREALLOC_CHILDSTATUS (2*CONFIG_MAX_TASKS)
#endif
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_CHILDSTATUS
#endif
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index d9c55f15994..67a63e65dde 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -56,7 +56,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_MODULE_DUMPBUFFER have to
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_MODULE_DUMPBUFFER have to
* be defined or CONFIG_MODULE_DUMPBUFFER does nothing.
*/
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index f7bf1b9a846..9b4add646a5 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -58,7 +58,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_MODULE_DUMPBUFFER does nothing.
*/
@@ -84,7 +84,7 @@
* Name: mod_dumploadinfo
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
static void mod_dumploadinfo(FAR struct mod_loadinfo_s *loadinfo)
{
int i;
diff --git a/sched/sched/sched_waitid.c b/sched/sched/sched_waitid.c
index c6fd8d4501c..ca245072796 100644
--- a/sched/sched/sched_waitid.c
+++ b/sched/sched/sched_waitid.c
@@ -175,7 +175,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
* distinguish any other events.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (options != WEXITED)
{
set_errno(ENOSYS);
diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c
index 4a669958c7c..aa5f2dccc6a 100644
--- a/sched/sched/sched_waitpid.c
+++ b/sched/sched/sched_waitpid.c
@@ -187,7 +187,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
/* None of the options are supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (options != 0)
{
set_errno(ENOSYS);
@@ -309,7 +309,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
/* None of the options are supported */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (options != 0)
{
set_errno(ENOSYS);
diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
index 854747cb012..873dff5be19 100644
--- a/sched/semaphore/sem_holder.c
+++ b/sched/semaphore/sem_holder.c
@@ -372,7 +372,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
* Name: sem_verifyholder
****************************************************************************/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
FAR void *arg)
{
@@ -397,7 +397,7 @@ static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
* Name: sem_dumpholder
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
FAR void *arg)
{
@@ -648,7 +648,7 @@ static inline void sem_restorebaseprio_irq(FAR struct tcb_s *stcb,
* should be at their base priority.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
(void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -723,7 +723,7 @@ static inline void sem_restorebaseprio_task(FAR struct tcb_s *stcb,
* should be at their base priority.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
else
{
(void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -1036,7 +1036,7 @@ void sem_canceled(FAR struct tcb_s *stcb, FAR sem_t *sem)
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
void sem_enumholders(FAR sem_t *sem)
{
(void)sem_foreachholder(sem, sem_dumpholder, NULL);
@@ -1060,7 +1060,7 @@ void sem_enumholders(FAR sem_t *sem)
*
****************************************************************************/
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
int sem_nfreeholders(void)
{
#if CONFIG_SEM_PREALLOCHOLDERS > 0
diff --git a/sched/semaphore/sem_timedwait.c b/sched/semaphore/sem_timedwait.c
index f006268c5cf..81e7a79d506 100644
--- a/sched/semaphore/sem_timedwait.c
+++ b/sched/semaphore/sem_timedwait.c
@@ -107,7 +107,7 @@ int sem_timedwait(FAR sem_t *sem, FAR const struct timespec *abstime)
* errno appropriately.
*/
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
if (!abstime || !sem)
{
errcode = EINVAL;
diff --git a/sched/signal/sig_nanosleep.c b/sched/signal/sig_nanosleep.c
index 9ffbcb52c76..382715c7987 100644
--- a/sched/signal/sig_nanosleep.c
+++ b/sched/signal/sig_nanosleep.c
@@ -108,7 +108,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
sigset_t set;
struct siginfo value;
int errval;
-#ifdef CONFIG_DEBUG /* Warning avoidance */
+#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
int ret;
#endif
@@ -135,7 +135,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
/* nanosleep is a simple application of sigtimedwait. */
-#ifdef CONFIG_DEBUG /* Warning avoidance */
+#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
ret = sigtimedwait(&set, &value, rqtp);
#else
(void)sigtimedwait(&set, &value, rqtp);
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index d1978135c59..476e8c06d72 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -430,7 +430,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child)
rc = 0;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
ret = waitpid(pid, &rc, 0);
if (ret < 0)
{
diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c
index 9e99d01277f..898f80060fc 100644
--- a/sched/wdog/wd_start.c
+++ b/sched/wdog/wd_start.c
@@ -260,7 +260,7 @@ int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...)
{
wdog->parm[i] = va_arg(ap, wdparm_t);
}
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
for (; i < CONFIG_MAX_WDOGPARMS; i++)
{
wdog->parm[i] = 0;
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 4be92476d89..6011744b94a 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv, char **envp)
printf("#endif\n\n");
printf("/* Verbose debug and sub-system debug only make sense if debug is enabled */\n\n");
- printf("#ifndef CONFIG_DEBUG\n");
+ printf("#ifndef CONFIG_DEBUG_FEATURES\n");
printf("# undef CONFIG_DEBUG_INFO\n");
printf("# undef CONFIG_DEBUG_ANALOG\n");
printf("# undef CONFIG_DEBUG_AUDIO\n");