diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9fc2e5e9e29e9ac65548c8c64d5eec5f7e854bd7..b067a8c13983b15f2d557eee1c985a07865cb281 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 03530cbfb67fef6275145f8d810912b4f7af70e6..a6800983d5bcb272c099f6bfba24de374b9a707a 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 b0afa42a9ca7e288cf5c0502213738c013d3c264..12e8887d3b659d171c4607c39457630514a94400 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 6b6c046060d4e3ba2d7233c2a90d9f18b1c401f0..f31f81277830e7249f328ecf6073c4173cc8e48a 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 7bd0449d621d225ad6408ea8d6422c28f71e4781..a5f2eff8e47850dc2826a75f7887f0bbe7461022 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 3355f29b02cf2dcaa2570722632ddea9bd1c57a9..16b59ab8ae96fc4054e91e16ac849c0cb2f2293f 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 27ba8575f52d023f7c9324244a967c05075b6d1c..93021827300d09f52eb1c91b7518cbe43a6d123c 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 caac7c3e170c1d858882bbf13a32ae10bb6741fd..46ff7d27cac9225a98bca731e1a287dff5beb9ab 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 6af683225ca64dbcad3a639e1f64714018f68976..99bffe17ebbd38510bc10b734fcd1623d480e010 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 9b103e97185005d00d3e254fee0d6ca03ccf3fce..dd9790ab10774093de24bfce479ecf4ee39f4103 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 0db0379d1b4b4360b1ba4fe68491c546afcdf1d5..26b0d8125f510f055abdc400f8e08a8e66e52a44 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 521cd5a93cd71b10d8f5076fb8283a0bd4fbc423..a0f5de604f78b1455b2e72f10108a31f4c8efd42 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 d74584fb298cc557b03dfe5dfb2804d0a811152c..7da8c7b21e6282b70b4645c57fb806645ef07fc2 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 4c33f3dbec0bb4b61b846958c7226f274b549b84..eec3d12e054038332fe20043930130db88ed1820 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 1d57bc3e500147c86db55809a6c4cad1aca92c5e..2c9b188f0258348928741b88bba8f1a61546d46a 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 205d06b6440fdf6cde7632642917e7454adaf93f..f09659190b74a2f4078b0c0df1f5f31cbcfe2389 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 ebfb22667891d9084a91b3b87ee0afed7db0a55f..89e74c1760bedd01330ff9062de2016f0542782f 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 17c73a254de4d8f121593187ba0b4c62fad42a41..d6a3216da96da623e67e666ee3a606e9b7ea630b 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 e8e6b8dbb945b86be1f0f18c61c5f27b11bd71d4..5e2aa0810d456633c538df647c3393462e9365eb 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 676928c7cdf0c91231a01c86c9d2bb3f7f0c1e69..2306d807136ac5dd8906e96571396466ee6d4736 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 53f94a2e0faf31dd1cb2c73141c0c8c89bfa571f..da317c12f978c740dc6472bdbcdbfb19e7411b4f 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 04c5205efe057ee58a52286f961e40e3a65624ad..d8689d85bd6ee0d893a2e8f7040a44422d0787ae 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 c827a38868abd6f571c7f3e97049c2802969f018..995fedd1beda561e0c4c21f4f448ed24bbb1d9a1 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 6c8ba18e4492de454d46c2f169b89fc8fe71e242..498f702281f03a10c166f755f89563de8e8a095d 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 468d55e6af64daa53dc17ccf20554a042169eaa8..4c242126bbb07125544319566dc8b1876b4de91d 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 945d5c4338f27eddd05964437a3989e5459fbce5..06d11d5d634164f9a3ae38d1857fa5edbeeb238d 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 8106eaf10e3714bc57d62c81784ad2d45100e96e..4c391ed84815dfc0bac1f91ccd40bb6ad138c425 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 36c2fdf21682cf9e24b417aa83da5bcd60ae845c..3e67f44372984cdb8ba02fa369c241ea060459ca 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 b5cec07937933cdc12a47165f980057554c8b0e2..45610c5cc09e0b0228412f87c8105707bb145911 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 6299a4624166e76bb5b8d26c053bd87a8168564b..83191f510d4730468504a7738887e4b904b5c320 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 52c6bb2f98fb2f15a47fc8473bd167a6e73b0df4..927ace3360eb6c7171383a04681986f3f54a4f2d 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 220026da340758619e11b7ec48c3b122957a5975..c98ab30719d5774314346cea3c4ab0ece6007022 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 bc4c99ce26da187dc4508f79e9737b4663ca1fbf..1a546c813d4007ea2105fb0ae544df94dc469956 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 f06150772bd44a6da885ed7a7c3749edb2afd9e6..18f37557fb9a045d076690d83d2f932c0b939fbb 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 10e0569d1f76828dec319283665f7b149c154f52..fbaf5f5e18a0dab74344d09f09b44958026b2370 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 208ca5068c037aace669f0e5b635f6c817a3aad8..5b93bbd6cd3e8fd13640a312830d70dcdaf12bfe 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 310c21a90912303363435c59a6dbf1f348386ca2..8ca9a0293c79b95fc71ba8a6123d306ca7114329 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 70fdfcd95da569a31eb183ab922b7e15bf4df00c..e7546d3d238b8e82b88ee802f9707e9597a3b30b 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 4d28224fd7eba41837ef4b49a91a4381733c4af4..eb9f41b74fe1f90753d534b51d69523b881e2711 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 a7082e917315efea2d4fd6faf4515778f2db8eea..8ec701d9adf310e02a292ab72ca4b382b3583fea 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 9366c5d1c2d65e6c2365142b58f2852a7092beff..cf2d73d43887ae29201e8ac54345cbb727f9235c 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 e6e4607b0dab9daddb990199bbba98e10b8b93bc..ab7228eac24d206bc9c133db3e1d7500fb767c64 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 401835a556ca2e5a910a3a98052460c54a9e20e9..c68ba0f798e65e9d31e069bbb364c8c3373dece4 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 f9716239c34a9d8dc3302ff731a3d78bf77c1c64..5ecee39ce8d88c36e44831aeb1e908902b4f34f8 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 67aeb2e94a240db6b6f00282643b4590dca98065..26d5f9373d0a32347391bf6fd8156afa4956053d 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 3497ded776e8bd488da16d7dff89bc145d097df3..0fc1cf11761626b02a06034b56ee9c68c0c6d86f 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 c3aa9d7adb917d16f1e2c8c2c2e64402bbd8a26d..1aa06a31c36b96282ccdc7ee11552e919a024265 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 57137a60def127946b8ed5079c442e2433bd85d6..1a41f52ad47ebc15ce9a8cfa3032352c6df8a51d 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 511138e4f51640de6328d0d1019d6241ca2c2898..da8db2d0b00dcba75ebdba0c36e667fa766e95c5 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 b6c6def0d54aa6e1795463426019a55a4cb54645..b753adc2746745c0e3c15d6f6e171f51d1f4c96b 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 aae0d5fe3cd75dc0a2b65ba5913ccf8ac362092f..ed3812c698012804bc6d7f0640f529e717b47cf1 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 ad1abfbfa06550a44aeb96d644df6eed23467004..877cca10740d2309d6d0830c87e6d79f490e2eb9 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 e2f0d3b5df7fc7530b39e467470ce7f587dc56d0..d59740781189b99663b08fa87c1fad7d8cfc4ca8 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 ed54bb5148c80f63ad81b579f1f91840e3933eac..50c239954aa5b038eae0e66ce593ca73116d0cc0 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 de775d4dd4d1eb950ae8cf47c548c37baeeeea01..aef2df814e57a6ca9a7387c2b14f9f4bb2e807ee 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 821d5cdc76d469b0538df013ede64f8509ddecff..078ec8e8a4088fe3d53d4da8fd037d5f91c7028a 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 e57af783531a4c39980ec868be90b3534fed7043..4e0fc0f37dda8938a784a8c79f37761195c57765 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 d0db8e6bdeebd90623ca596d3d7c92061120502b..3f848de28a2e5385c446d70084b7c11f90bbfa38 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 9d4dfb514e57f24e6e43d00e434a612fe7a21cca..0d108d481140b0968cd6f04f0490fbffc38821b0 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 914ebd03ff3b226f7ac48575f32d17596dcdbb71..1bc1c9f107f82144767e6a71a0e0e98cfe63d3c2 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 fed33adcba28fc10f17177ba5fb58b8ecd775f47..c0f3bd4a5f7d73df4226c5c24ef081bf07b98736 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 7c48070e4afeb6fa1267ee74601a63f16a81a667..321de58d7d117484bfce17af74350f1b35ba816d 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 ec0171f2307b17cc93b29c239364aedf98435788..f62e1461d51e9476adf440eae9634365b4e9e90c 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 3e75e631ea257b808910660cf05a0f05a998e661..b526376c8762eee67b009190f1e37781ddc22601 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 bffcadbf93ec8493fbfd12a5a8a7c99b803b3586..fab48672073707b383c4e9bd039f93c54f67a901 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 9f4c926cbee5bd6295655db6567e5af35bb8a4f6..0c3c12fbc7f0cd2f4e7e982c56a785b3a81c6791 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 a6387e732168c2b2bda1cb45c3b4ab04fb0077a0..8bfabf7085641fb359bfd3555ebe96265224df57 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 d487931dc63362a429f80b953a7255e818a04312..081f366ea7cb6e7ed1265001fedc0ff6800bffdb 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 44f21af47d611f546d8c80d9c2c13bc2b6aedcb5..6fea2521010a547976315333ae43aaa0f7f51e87 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 6d8f223591123d2d2ebfcbdb13af07d14c1c8f27..51604dd860250a27fb17065c944df86380dde6ac 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 d385592b409f493cf4829e37fc7c8a1b6d142317..38607d128b4e64ac057475d92c43cfae74128b60 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 550ff55917d5a613f893164ea9a74ba147e4f219..1d5e6d484039869b5b44eaaf007d62c42bbbf717 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 fdb76f455c3e9304b4eaafa91177da56b7440e43..e92edd72a09257f93abbd5e5915368cbdcd47cad 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 39308b6948c0ed1c5651a3a960cc610bfa9f5bcc..105d267a73ac32ea846f1d8b2e12103b7eb02e18 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 b6ea6de628318495dd17d2f5a53cd459290b736d..961414b466ff4ff798b7233d75fd2db3e93e7698 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 87d47ab35c0d9f2ce06874e42bdc131730332cde..1f62d1a013659679b07ed3bcdf716321187429ca 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 52249f34feb5c656b4ff01c3eadae1ec34ef717b..72f1705d210ceac8f5c266d3a363a08b4459536e 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 eacebac98a21d434e2ef5d02b2219003c640f6c3..e80de128ad84624a3b21ec2248ab303130bce5a1 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 63491ac74d70503d749dfb32f01c9d59e55f0173..6e9970517f57854eb7cc18986237dccbd6bd50b7 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 45bb842a302f9c4706c1b9986899e4b4ba73fc81..64badf0dbdaec832267b3b3860f83450a5e3d449 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 fd0e046964d6e115d0ca12975edda4de2db24ca8..041419c2488e42776cb9ed6abd3270ec76e896c7 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 6be8d9c55fee4b6b11c0177cc31cdf6c17cf08f2..5907c8df2ca57aad4de503edb7a0ac9868225c92 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 c6daaba380de3f4595ce7c7e7b304648c8746578..80a299926eb204c43d7524a2e94639c8ca298742 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 942ff3e2fc25de5453a1378dbfc59de904c3f53c..c0659651119d84f8d1183505e7bc01d685ace219 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 7ebb1b3bdb63447ca2580fd4f629482350c734e5..a272f6f9406dd3cc270e2aab1cf36bd3bab043be 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 78429691490d69c6284c9e1adb74fb1133fff331..917cdeae275e6a5ef705a3e14e67293309b684c6 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 a7b995fd909f7352676b5d16f63b0add302dc029..0201e259f7ddf63b7a2467277471a80571b44cfe 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 4bb53068bb687b6213aad7464bb4451b31479cfb..e2315fedd7ccc3b098062f6489c2c1e29c5d0109 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 fbec7c40e2adc6def0ee725a4ad7668742a68dae..eb347ff4c87e9830b256bd3074f43e296f8bf931 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 ea08c70fe101714ef89f6214072004e23673aa5c..d7d46afd3fd3de882b8a1f669665b9986aae7b0b 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 5180204a3223afc52a99fe67feceb50c8c105e9b..c49b61ad5d2e11ffdaed65b8548c3fa325b3038d 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 fc6ce33162bee1d163bfc36700c33bd38b848b74..680e02a53d195faa1107ac7b7bf65cd4569f9206 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 d1f72be399a9bdd1a7c93424e19fe7e50eca7ed1..734308952e3e4fdcaab42fac778f620f32057587 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 04c1830dad05580d0dd2b11e5064775fd7af7b13..7fe1edee39caf29d532d4d38ed6fc40f5aba2c56 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 3fdb7397ac6e37cb7699e95ecc4785ecd5604c33..756feb5f52d97479e5a14b0423961c168840a457 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 3f5c5a5b66d32374ea7e201c848e77b11c77b939..4ba4d8bbd3ee2ebe51ca2703564f1169459e295d 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 7853419cdcd12acce2944dfc866e6ccb5235223e..34f30a703e87195c52f163f3a46c5b55695943a7 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 f80b12de1dec6e0d80829dacb3d5d90e7072ef8b..6685cb0723f174e9c5833733ae12afc35ace93b2 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 8d95518d02d3db2e930b93ff0e956cb4e8eba1e2..3a0ae1d70554331623ad0447b8a4df2949941ed5 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 198c099cd178ac004ed56ee674ae80674cd22f44..1138f6b38ea8fd34a71053626ce380dae4f0b0b8 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 62495439afda266212239a8fc00c0f807ef68385..cb8f8366e889aca50663ec47e39d0ff7d6d9a83b 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 68926095cf0deb8d235805575f08c988e03c1c74..a9fc00c245e5beaa0baba9e763fbcf451da98d93 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 8db27f29ebde0131b6debe98baf61c91b2c28949..c0d6c7651005064685c3af454ee3866ac941e9d1 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 cce4c2adb0a911cc62614b5beb4b16eaf76b2a24..926a7a1280e6b96c2677330544814986bba61f4b 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 08197970c66441ba32757d370888ef34abbf7406..eb9cba75701bf43af424c84e4c63e2ca32329783 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 179b390271c02226308150de9ae423983f223189..551f2d240e7275403bfeeb92b84c81f90bfe93ac 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 ffdaa81146074f8e13b6a2ae858a5931459c397b..e89430ec9b0e238c2aa63da3a636ba32117f34c4 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 b881daea634b2c4ad822a9ee0d10f0c6eaec932f..498d848da30db40b40326a4986851e25f874abba 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 f750ca0792db960e6025838e5975bacabfb70076..fb4586e009078e0c37ccd596b6e98db8e186d9b7 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 25a8bb60049e3c14775073b06ad9f87b3b000e0c..bcf51dbbe7a164bae2e25902167f5e346fae6aff 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 9a2bcad916f94fba57da7c71ca09dee5c9fd71b7..84868ab13fa8082a75f372cc7238cf0a60cca86c 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 60e0ad3ed0fea63be3a6b51f66894dbeb178fe93..6e5d7ef3a789e822e5243a1608208cb3bb9e5d74 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 51cf9470672601f15904c445e435afdcbd7c058a..06a5ea71fb9653571d343ae72d0bde6c92a6053c 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 a170b01e217929a58ac80f5152e38e9b2e3c0946..0c536fcb6c073d1108185ca2922b2db8116d425a 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 6b5e456c246a50e2625616c06bff411f4ed17c38..11da4b3d1138d3fd2aabd530471aee5a027aa167 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 37313b901e89ed5645a2799cff7ad482975f3109..a84eba773a8a88005097ea9f97d9cf1a062897a8 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 4f16c841de4fc3d64bf38f3a6ecf68cc0e59649c..24a492beaed8d0f3851258de97427215111ca541 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 a6e54b51f04c12ac917dcc400325d1e8d4ca8fd8..f45e9248c6da5c9cd3bd2974a2c5885964d9deab 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 dad885d86bd52050605ed24abd7df00322dde0e7..63e7d768bdc6c712a921970f00819f4512893689 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 9671a4f8a59709f3b672240eeeaa33acb1f5c4f6..799e3c21e65dc5cc79a0d2b548cd9b27d2765cf0 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 2d1604d23a4c3a9b44ce09773c587b1a6c47e75f..f283a9aaf3611d083652eefa8c6c70309cced9fb 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 bc9813f44d5a5be2f25c5963e308af893a02cecc..629f5654c98af5b9a3821f3a43e527754581576f 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 e7e183ab5528a5b921b55a9ac7c680546b7e74a1..101f355546c91b1290c9c5312af3940d3bcf1ad8 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 61c8ce3c4ede2cf2db90c685ccebdfedc0e6dbf3..141c7090f16b11937a904592f57cc8edb8be1a97 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 80ffb581ee8fb978e3f69d84435504b2a4493890..e3fe5c552e8b37ff2f652875cd35027fdac61b51 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 082f35eb3bc0df4fd7f09be52375599753d74995..6f0c36e8551dd021ec39bcd55f790a7205966431 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 3a9f06519125e649d5395e84056e24f1ec2bd0e6..7a5a00e85a2fe4961dacfb800b81548789e42610 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 480bb4f588d3d96e51bbf284e81488dda38ff8ad..77223498811d80e66c43911d34f7b8d11361ebe0 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 52e9dd209506eb1c68801ffdd5a13b21ef635864..1fca1dc0e50933c0ae6f6a1142c67d8f7f6cac5a 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 0bdb86a8ee91758b9abe40595dc4197cf239cce5..ee6f5f1824c807b36861bac4b941508e9022e8a3 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 3cbb5becdeefd337815e90a32aef0a00dea9d778..80c01077ae817643421d210c4bab4ba6e52c60ca 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 b588bae2cc88a759c15b59204d2718e4a6d34d87..ce158857cd253f0f5125940c7299e10c914248c3 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 e71ffdb42b56c240dbb3e8ad633936774e5e3d40..4da8e54a8b2fb304e2716108661adf73eec191ec 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 2c60c958bafb52de962230878cba25c9c70bdacf..d3d289928646b5e275864e78e55ddf52fd0a89c7 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 0ff4f2e14485f92635e190cf0fab525f7ad3f973..3b8a3cc2c4105beb9e0ca0646b0fe2258918c259 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 e6fdd770ede5ef07f4e55e3ce4d23309dbce5db5..8f6e5cec99446c13fa0365d4fe888ac15d09a3fe 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 f8f267ef5e39a95025affce1248a5e82c06d9707..32d579a12c127f80f15bcfd94898edd825bc7f1f 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 bf5f3c6e7180c3c054709fb5d53b9b22d1292a08..8057785991597ab3e0ae21c6aca37ee43f76d9bc 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 2a8b2f990ed4c6b582a9dca47e5d907927e4e606..d775907bd5d218ab4270a67907221411a21d3abc 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 1877f7d111593994a700fa2c60cdc4f726612950..98e06ad936d1eee3344bd2ff42becf92e68f8621 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 e2817231141529a1150bd10f0ad99438891b1694..516153e191b257d0e51ac32446e21fb9b412b778 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 ca9938782e90997b52124e162b5738ee1c033c17..adf2842ae7d4f74b92f31d265be3868be626a170 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 dc1d449808ab653ad2d43a1d5730a745c740451b..abae1da7615ee1040fe70e7d33fd8d480ce86b1f 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 985249c6f6bb7df6734ab26646e3ac6e63b5d989..ed67d4b5caf62d2231754a522c4159223a82d33d 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 265c3f636d29418513d25f6e1634aaaba31a3a90..1b2030237f57de4578a907cf7e0e0a2f61d81b21 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 c1a30c9fc50e17fab05dbc0150456ade6db07746..976867c706b5696d831741c5c1de2265461f95e6 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 92dde8675601cd568616ad766e212db45322a3d9..be009258426f641a9dd2d11266d68d2c7a4198c3 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 da7da52e3914689eed45b0a0437df6a694f98f6b..19ffbf035254c042c50ab7dcd267609082a52a86 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 e1e307199625ec91b7965461a3a725a42faa6ffb..82208b0bdcee15098b5ecbd84d3b1592efaf96b3 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 f8ba29f157636ed0913b530aca1cf3c069bd6d32..f84a45a65d027e675a4b59417c1d83d04c090b51 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 2689ac414fff6e4b5996aff4b665bc6a3535b0c1..b9a3ee38924034c951d407c165b61d733eb1944e 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 f86edd31699527a8fe316031060daf8d0fd6e085..8c305b5a9b61599c42ae900af0f8ce88a650a94c 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 c9fc885369db4f1e689ebc442b2b638cf47c2a0c..b6ba92c23f1f60f55796ff8def881c5e9e5e9dd2 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 8d41577c7db5d7f76acaf688e48248632c811fa7..f5affbb51548f77b9e461958b0f71210e9dc97b9 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 755ccc1dd9cb9ea107331c9863f25d1ae59b6fe8..ff99f550f78b5268323679d450fe396c8b29b6f0 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 c6fe757a983f8b98589cd29797056fb9e8903219..b593a15181f502bd192d47489017c22925338968 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 fd06f414de21fbf764005cafc45c95ea753008f1..8ba0aed7089998ff810338772680667c43380d3a 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 2e13488a5986bfadaafa80f9815d59b437ff69d4..adbfa2bc0449029859fbbbad56e477ec6d147a5c 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 cc2b4bf1c8ae7cec3fc636e6b400243544cc9f7f..821a18ec619dd236b71f2e7e3f9da84b8f5e5463 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 f4229b8d6c0f4075e183cd8b038b632452bd4b9f..1467d29945adf5e3db348849e2b88ef96c6e9cab 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 65e5111d566792a561f8ae61875852b2f1cb4d3b..7aae6c7be1b20275d671b0ce3f7003d31cc2a7f0 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 c80cf5812ea5e8ff02ef42028477d59055680f19..5d07e57a623578ef743cf38dd7ed85575ddc0d01 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 05600d9ec1768609df3a625216eb8db0bdab0256..0260a947b6072e7275bf9c40157c4426eac6587a 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 646a848bee57d6309d5f77f7e16c957f1eabd006..b681de8b29d3cb7f2a6d2e928b8cc15bd6fd0c4a 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 97ce8ce964a459e7c3391a46b61e3d26309c5da7..480d0e9d9fef3c4d675fe6b0308d01a96cab73b2 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 8d5df8423ead161d07afa9f78aca14836cb85358..7a6f8dbba2ab87437f8c4bb6c083f9da69834762 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 d430898dde48b571a595a7a22a184ba9a1000c1f..5aa22b90a79e870f3ac3cbb5f4e8fd1e55970e8a 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 72d8bb82417e4f331a5f7f7cc138505eca92507a..a73cb0e4208ab9b700782a30b62d38435d085b38 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 8e1141543a5bd926efcf7f86b3718b0323895061..e5507a3949912eab6596345600409afa9288594d 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 77301c5c43972d7393bdeb207d383e776e02a6e9..609823acb638ee7e1520e724ef41577daa4783a6 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 4b37166d4b3f0a65870dfe31a7eaea17835f8cd7..6f4f28f9a445fdabc711af013906d841b650ef14 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 63b6615b556955465ba7f093342c3fb3e7fa4b13..86ae201745016affdd9f31a5290306960a374995 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 d9a82f959e592953e0732a5e8c066feda4e9fc7c..7ef0105780becf9555c51205ae426c66680edf1d 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 cc1c60e7a0cd781d2d37aed06b533b53428ccd0b..86224469ffdec482b7bffa3d5aaa9ecf3b1f7493 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 3f12b9943ac58f79823e36f3b285fd8f5b8c9834..42b65d814fcf14ca46f67bddd6f929811bc42525 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 26ba8bcb5d3562617a54ab2552d2cc20cba4a2f1..3e9704cd141fe23b4c71e1c76e90b1a336b9c78b 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 ae50ca39c1e3a779a2d481782f713a60517951ea..e44e895a87861152808b5e6bee338e34e7ad16cf 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 78bc1b9cf364fee233af7d57d463d1a4d13ecb39..b78ef8c5488af4dc87a424f6ff55c8d1854dc918 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 e31a1b274df320404f28896d39d68c8dc8ddd299..f46e114fd66e41b78858a7151ca856d5ae723a27 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 e5d70d93a73c2d0e2cdfc2ab23c1f63cba0c9eef..8b5c3b6870e9b87f2902622e3f651c6304715ede 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 e03cd76e6c9919809b3b8597189b10f430b025ef..ff39b0c6591d4841f5b983c23300fc220444f6df 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 10b0cff4b5074e6364f39ed22439c20a0e86baff..0bc9daf91906267a648213a1b82d795a15681b35 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 963b87db1daec5e15a714b763fb355068426c2e1..3f7c5eeabb69f04f290aa9d5c4b663c84ce68d20 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 15c9104781792d6d46381b02b74f988ecf8fc477..6e31dcac6d3d5ca798eacd2dc7f88dfb27095b14 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 b08490f2489d36111ccc46573d69d09410e7545b..cee4d5110fd63b2468f4228b9fb00323668b123b 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 c9f08e444cd03051ee42d942c588de7b775bbe2a..b188c3dfd694f7640dfbfa65d19d5bdd58286d01 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 454947d57220d7edfb35c05d48ee81db6ee6fd48..3c264eb4e6db8d9c81d6fdf8a761e6b37a5f7549 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 b2203519cb4fc7bd0944a0bb8aeb7bb88e27fb36..4b1ee3bb602e7659aba6d65d14b5be42a39883d6 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 52891da588868d81fa7cff6f8b7c020ac2c445dc..7c1b45a557eea44983001f9d925d5df2f2e5151d 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 15673deaf9eedb7c01c8af2fcbf5988ab80b00af..9efd00d6079c0eea870fecf8a4fd002c549a1e14 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 3e242d8525b176e36e95b4a65ffc3bade0f82415..87123462aa137064a7323479595bf38b8fcf36fd 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 c7c2275b986241639d75661edc8db3361feaeedf..a2f0774079b2286e42a52fd295dbb6e0e3fbf437 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 cd156021e35c568c45b9ea881487c4fbae8bca96..efcb01b92ee0c41d1918e2321da78339a8dae7c1 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 c52f63fb9b7570896e4524512936240aa458d51d..f04782980fad52806517bc2839abc51884c2143b 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 fe98581d08b7ecad25863eafbd2a630f483b7456..775591f94a56d5323925ec7f50962ce795eb2eab 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 a9b89773eade9476a4f4b568433f6f6f86de6919..c1e277fc2bf4974ce06b2db30f05b2561fd219a9 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 0b691c270d2e05c79b67bd1eda98ddf83e99adf8..1a3355d24d446ddf1b0e7e5c0d3c096207cdc355 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 a1cc224f59d599c912d7717d85501d7cb551b207..f52fa2cb4aa699ede2a8bb0d92d13999f77cfcd2 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 29545492efe46c0af8237963010bf5c671fef5f2..b361133f1fd556d7e9d167fe9a43fead08069b56 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 77d49ffa084d67a2ce431536d5ca47d79883e39d..4e4f4327c5f745dbed3155a7832ee9f526cd630e 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 481538aedd6ce2d30cd6c49be832c596f63e68d7..19c5e3aee183433fd2b7cd1e6d98c8d8a1eb3c80 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 c1790eaaaa3f8693950edbbb1a1cc68a89bb273a..34b49bf0d6da1d2dc9e2f5b31f167de6ca18114d 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 e1d7e3cade17f4bcec20a784b5eb65f2364d28ae..6b4728cf6a93f8ea5df3a8876d15c125d97f8f3a 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 cc0aa02120f3589b644fa1930a9b4344eaa43bf0..3ed1e6939d1ec02caf095250978352e28d430498 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 e6a347c00ac3e26e11c2571e81b2bd308a08769e..803345b381040d538256a4f5f425c2d782a95f85 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 85af854ef4d41d95b5e4901b5e46938ea5e31cb4..1e52b26a01d20b8636a64d5a75edceb80e0b7af7 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 2d347ad87006c374dee30e50ee028db28bdd2fee..05325986a668dc72a26c6616287d0314c33bf6b9 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 ba0d451d43a8d8dc83d40b73952c26570ea97e85..f2ce8e2abd4c46b3167d7860f507db7573b3eabb 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 7df1b921ceaa1f982968cb2cece655591ae2c9ab..6d14771b6d97502096c5f883318806ce0ecd7c37 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 4a81571791ed5515c8aa5ebeaac578023fb30364..66f821478357b4892e398fd35e031cbe072ee93e 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 0af0465bffa5a0992f62095f8ff79d4ba3d9d670..549edeae6d9194b8f05997420bb1c8125545d9c3 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 4b438a7e72f68bc5a4a9ecfee1f158f3bbdfc875..8c856b25c4a0ddf0ec7f0ebaf9641d6f6836546e 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 3b0877775a93ba051e91ef23f7dd40837c53c4d8..1f1cbcaae7facaf33de4f0d436bfbe12a5a32a73 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 7244877af661ba848abef5b39c90bbd54241e1d1..ae31eb5ccd7ebe6c21f46ee9711c7724ef91d902 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 6c3f7eea90d86845c4548b8d1fb53705b3c5f234..f589b83efa16762cbc58bdc2dbcfd178ad9f2b6a 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 8e58e862a9ed94ad48523be4c9cf8cbfa5ca0b96..480d5f58b46811e4bbd7320e0854c75bb7894d88 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 5f352dc26c3939747b0dd5b31f7081ec73cac926..631c936d744cf4eb70403f1014b3c8885eb21dac 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 2a6a7335446fe83bcd1ecd59f0952667f3cc6fed..7c036a8fa614babbc9c93ba3fa0f7e101e45029f 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 dd20476f57d0f2febad59d01f4e53fb6fc6760f1..a65bfadf965dde6e7975d4e20961bfd69a75ac17 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 643ca1ecd861b8549a97e0c3250d9fbecf4f07c7..d3ed1ae31cdf7714eb23a7c5b21cf981459ab928 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 0f79fc17098bf73affe918b4fb6f223f2fd22940..e513066a6aa37a4157c43b1dd70b778248fe67d8 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 e77c028ec050d5f711b57f3148b82be2e8c18bf1..e4bb50c8848c71ceba95b04423dbac209dbe6720 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 2f4b7b251346b339b59bece843d3292169b8f3e7..a23e141e21bdb149b463034e1296119d8d2fc054 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 24429b01e2045a3b28ca6223a989a9b823098135..fcd3357efe5ac8b675cc6a449e11ab41fc78b71d 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 1123d0b0a9a9e597d6ae8878923c071ac96bc6e7..af0e461446681c75b7e23f6335f48f81eaa7536d 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 7fff5e249984d0598908d038e8d1c72e1f29a77f..e08aac39f779ded5679af4211d71f09f36df143e 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 a52e3e56d934e02eb24a8b92f79d32bb1960e1b4..ca3c5f64fb8c54c49afe7d72adcbeb642bdb9946 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 eccd8469bfb32013e27552e180cecd77848ace48..6bc1cc992094e9eb91a578ca926d44711055c50c 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 d7b602efe472dd1630e38aaa04ef78018c1ace4e..a1acddd1bad0cb766babf45f207d7e9f325a5f18 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 11cba6d3637463381eb615c4134aa5109b6272e1..1b0973e891d381efa07dec8dfd5dbccada89ccd5 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 3781de996e69b1a69495c712b14e7c8dd9ec9f2f..00789f419b8353e0b347ac10df147f45865eba0d 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 185af4810fb0739ca3b612488e25f883c94bbf68..49f8c95fa5d97b32451c09add95b43e7c0f648cc 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 08bc407719fcb72a5087dfe8d9a221c51d72c2cb..679739d995f5a9a4e74b1c6c5dd930b299d914aa 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 e0e963c66df118d575182ab6d4f51e361a7a64ea..ebf76d7fd267c1bfd418662ab14e4f98a54383ab 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 06c136014ee2b8299c65a1b5b8635c9de39259b3..7a932930ebe4587087d02e1441096678f0741542 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 2c349abfd983145e45f1d7cc3adfbf4c216c412a..c13ddf1442179871ad64468f7448d6cf41164b8d 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 712ed7c915066eadd014c09c66b98ad2692c073c..b3f9b0db170d7643edf9030eabbbafe294be5408 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 6209cde5418671e0ef56e5dbba093496c1bb43fd..1c391851b4bb4bfb91aa9f647a94c179dda371d7 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 c908ae9e3a10110eb97cdf37f4b2db391325ac4f..bdf8015e9122cdd2a3f9ba372bbfe9e09408c93d 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 6a299e8911bb182a95247a80e5447fbc2f9e077a..c35715e02d21e5010ca74a170e2a5b8803573420 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 20be1413092ef246f9b924e31c8a3e535fa4f4ef..5cda5b394d44171fefb75bda09e9d328ad40651d 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 693252ad35d219a3470530cd743652c107fe02c2..7f6edd4f9d8b741146a22623f2c3f6fe06c3d9d3 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 89ae3a462b2f6da0af322c9f0e6ca8661f3f1d77..c40c4329203c2816239d7c9ff613fd86f17ca333 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 94a90937fff7443abad6cd9e61dd0746d7aa1a41..86fda2d4f270ef6a1dee6743ace3a425dc0ad6a0 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 bf19f58248da151245fdec10362081a8e454d958..29772636078f45f0e8452c7ff1e19865b7260c02 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 67f8f1806020490de47f4c30dc6465fc90df2c0c..b934efdf05dca17b3d456dc4407d85d2c6b8629a 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 b4147b15675a9243487e430f7cdb3a6fa9915678..a70b06198c8cb411fa5c1a06d906ba4d5623222a 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 6ecc46223eb8f4c0a7beb824a31d3e79d7e3c868..db2abcc5ec72675dd4a85de8083dd0280ee6b306 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 5a77fc5c4b63db618393a9d1a1269b584656451e..395949471f41732b6bfb67ad0cb5cdd3c7f0a41f 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 66c92862f55d16a479219c50938fbefe7fb2833f..653825cce4eec077bfa98f566f5f20f523d48a55 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 98a8d2cd2faaa0b8a73db41b9d5eff447eccadc3..63b7fe95cd85002bfa8f6f97fb409675ae9f6e06 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 c2dda4d271d97de33e06569c49afc78907867f2c..6d6dce9d473348ca38e6755d3061be8a079bdc0a 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 fe414afd8f35b573f7fef5d63de2712437ebde9b..d529b33509541d082e28af0e41281fd9ccda71bf 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 0e784430127be3e41e9c4f1ae41aaebae652b2ab..f04fe9844c12fcfcc006238283346e6a5ec8a5c2 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 db76abc38d9d21f88a75ccb8d56c37c84d9c7d20..59c470383f02f8e8ad198fc5585e6c2d07300a5c 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 37a5f25f55cbdc41bd716923e3500a3b859d0cc0..a57893c831f80d05077aafddf4943b1e2eb0f7e0 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 821637423ae757dcaf60ca481c0650fac0d001a7..641d6278bda42cdf467bd0dcac79dc29644f51ac 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 d6f71f6e5c7283e43a44e96bf71e37140dc2c3cc..44be0773392056e6bf7f45a6f88759dad41c3721 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 936a79d2331c7c58f54b5789ed2ef5c985e5cc27..521aa2594515d6315d19551f522516c902f4315c 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 5c36cd08144fad14026b9f3e948f6587b3a54068..967730464780bb5319401ab61e780b3bec556f4c 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 9afb471e470f9a9f5402040bd2577edb26a496cd..9ae87865d069abc833645e7e67bc743dea1aab82 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 f80a4c3b0e00850c7de1f5c5d9a813d6c06f2f92..f20932ba611b3c0f093e331663c9700942686e8d 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 30daa39ea29ba63289d2e6cdad8aa92006bd9507..e6728f0ea88b003620dc22939d8265e4fa709e1f 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 4911c81145f96b3b50441d95c90068a6a989e669..0241009fc6065653b82fb615a2430319ba1c5e7b 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 7d43f0a3d8a6fef99dc18f81e75648d6379315f6..0004bdf5de7af9886749dedee39b299c19911e3e 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 49d31b4e1dde018cda7dabf6c5d5e17904aa228b..3747967f5b76b447e213f4454897d411d3d2dd47 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 5540b8bc4f8fde821587e2e4d1d15a8545c0f9b1..e4f9520b3ba386fa4cc9d42fec8faf6630c67756 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 36a1d2b1704dafae3e1cc0d12bf9b07382d3795e..5f167488ccf58e8c22bb0b3ebcb4009d7f0636ff 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 b7df229f2f04c9a6c52b3a38a6a1c8f8541fc5ca..e9ebdbbf98f35ace9424dbc1a309d62d13a3b91a 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 4332d3d8c2a0151392dd0d40082102bf418eaccb..c10048a4cff86bb8b64dd137063499797c280b86 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 3ef9e89df67903db4ad5e726359ca4486916b34e..bf507e5e4aae0c3ea1f86c8c7bb5ab9d7c994f02 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 1d335b179241a209162fd9d5f65c2146c223067c..bf394921d07d56bea31ec1b6a1b96033cc02e104 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 3da65ead3598a6c60683627b169b5379b85e1635..6d24c3e355a616874bac878aa31fe199f32286e9 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 a5c7e4839095d7476bb3b50c5e8f745f780739cb..9004af4be5ca5c4c6ae658be4670f676f6afd5b6 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 71b76180cb64b983ba703446402ba97553b3e26f..756ebbe80d3479c18533f0db2f45caa33bdcbb5d 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 e07a44fc3da894ec3922826340203ff288f318c9..928ce85d9f16f02120c0f71912940606cd54b6b8 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 590c5998a159fd0a664fb7769cafe5594d9af799..f36679aaa5ff6be71d2738108a61b2a07644d4a1 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 0cf450fd010cf1d340a6e2c407ea2007f3c6f3fc..613e7eccfa090c6bd3eec20137b211a089c81e69 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 ac412b6dc5262c644bb0d48884c948150cc1b0a9..6a66969184be7c517d57c946819cb5019de986ac 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 4118fc7567a4e505efebe4d9ee7c3272b7037adc..2d60888a371ad476530b754e37d424a4a16a2c79 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 1c1a0b85123516639bed213fdee81b2a2a6c396a..a370ca4c4bc8d334ae2678ace124acb719a8661e 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 ae46628585feebc9fdc8652b9f8e2830827294c2..a8707ca10704d1439fa32b80c21c2515a824563b 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 6845ff50352ecbea62faddbf0122192b8a2d910c..0679bf95ff339c4d8ca3be7f31a36863ed42873a 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 2a51031c45a3a874e44c0db4b6c016b74183c108..47879c3240bdec75ba0b6ce171c637d400fbb8bd 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 f52f03386ed13f260d4e6d48f56187b218d0d3ee..da202683285054fc7518e42eb830e15fe62f6c77 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 84845556e983c96467843fd43f58e19ba7035633..c2c41763c87bb511453b9b42c2816da56996ef9e 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 98c6bf273d842474e4d91df99a1267975fb5d252..579b15fe7f6766f492fc804fa43c4dd673eec446 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 640564d09434f54edec36286fcd5271853eb422f..4e29d7127cbfe3c9069f107e5e8523e42f59a3d7 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 f18da3fe3fe02581a8bd07ca3b8fe5b7635b99fd..711ce26aaaf16b09a8fcefbeac13d0fcd9a02907 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 289745aaf037684140d3a4235ae40d64a9b20c1a..ed5edee4275e95cc044b03396b93998f811ea204 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 9bb4efb1f5e17e6c4618b4d6fbc5ffda76d60f2d..e46522da8851794a4d977de14c3adfd51a213a57 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 58514a257444c385621964b5dea0d6997c56f5d6..3a0651efd478aa47472c403fad06c2162faaf1cc 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 d3dc5a54b12f12b2b1eb6cf07c3a5c32ca42197a..592c4a7cb26d1334ca4aeafa4e207d405d64a70f 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 517081af9d2e4afb15f1704db4a8ebc31eebb6f8..4bab7d5fd07194367502cb9f2f33ee8785fc6e5f 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 4a577053f2c5947423b414899819f30abe8992da..50399557578681b214cccf8736f913a1d738cf59 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 12779df0248e0cb320e41a946c8331a32226384e..a776bd5b1b5225ca4798a01290abdedf75f47ce0 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 07697ea078cb4557d8debe047cd5859445b1ad30..502aca23382648d3758451f45c76b114d15c0c2a 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 1d9b1008d09d1a4c67c3142616d1c5766e3f408a..61992d27407a6bb2f61f7a10c0f0040174628585 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 69924f5141d4bf697890bc62aa2c832ad1e01983..dbf0599dda8a8b55cd58e150d1bd784d9f760d59 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 97a208ad89332f0b094f36f59c600efa7559c6ec..bc55160e3a98f6806b977083f7155e6be7126b9e 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 82b8d37a8d704089cbb4e6b1dbce0b730538938f..2b205208b3e3af22ae9a47d53a97b21a6f91db0e 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 5b4b78647bc2b2de901b6fa961578be2b12a6e68..0620bbf6582cc383756aaa01c0d70cfa2ff25d47 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 dc06d022f67b3cda532e5acf7fcb3ee2dc6fdfe5..bcefc234ae78ee536a2bd729f13c43519be93a57 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 c4d55370408db9a4e2a28eecc525e73f4a868949..db9296dd1c6408a8f59d0a84addd37347026abec 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 7c238b249971094274c686f1e5f60e1ea67bef42..bb98e7f3573ac33af7d6649a2da782f7b91aab59 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 50b287d08a69f0d0afd5d32c32b1a2ffa9c2f025..c7fc43bfbc1abf40c3f9a323a922786a73b25e86 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 a100010c1c27b16ad12fe65daed0bcca56b2a356..76cdff2481b7d99e7ae470cb92d11f794a85f652 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 b6f5c66ad2499d2df58f809de5ca2d03edb28f9a..9f95debe31d890e4ff8b37c13fa2498d62788f54 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 8861726aee32ab65025216d389b175e0f96d1dfb..56067cae663f9ee0e71481a35bdc8bebb54bbf0d 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 15371646bc5e2d9060c0096bf5affef9465e751d..883a5d840762714fb6664ab74bc4fca272eb300b 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 d20c71a756e39b36a11aeb39cd5e82c3b782427f..af357444a95318d6d7a5296907b03a966790c833 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 222d71807004858624762222e042eb26a8eb85c8..a7b4733934319dc106a221381f4fec62d35cc364 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 60c4733d99e232d2f91f07d594591530975f15ae..b38a0b9a619d17dc09bb3350f3b0ecc678c6914f 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 82f647c18c99aaea4edb441214eeb43e328dd805..45efedd881e9f8102910a4fb462a05019ff51e4a 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 218a78232663302543378c313a897da7d681c701..17a1c037a91ab31335bfbb0f18ca6d88cb1988d9 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 1de5a0b004f405afbb98b2752681cfbd9c7ab714..b9a1bf15086de04ae44312810ddd902f3c368614 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 364ebfa95efa0bea628752ae794da9823625710f..308f8231b28da8c9557373e07b58399fb695b29b 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 f1c8a2bcd1a5f506dbbf2c5d205eb03a2d02f5a4..d9bec997c2933ccdf82cf8dc23c8c23b0b81ccfb 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 f5bbf0dedca3c7c328c25a1fc86a1156843e0f92..c6025165d33bae60f9b87b40ff37e3a24e127fa1 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 a2f1c4c535dbdb4841a925ba635932db3903e7e9..0e3b9d07be8c7895a08b005a8dcedf8bcb54855e 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 8c78148cd3575fe34bfbc21ec1b5d27a21663ee1..bf8713d6a291dd10332d5bf35e1baa13984a07f4 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 c5bfd8251e1c67b14f3b09c31b8b507593cecdef..f85273d27f077874862293f6ce3fcd0bae7d6aca 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 0f6a701379f3d35fd1b95ea9097f54b077041cab..eaea63c7b4b61f7a712a4fe35655f036c8270203 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 370ef57eaebcabe67c62a976163e8c0983a0fff5..cfde554d4e453f3262db9bed85b9e01685fd4a36 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 c69fed83c4398b844364bf8150c09c74f7e082c6..d4b534ce9cc05547728ccf3b9f7c2c58ad6ba670 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 03b10c89abd53b714f6551c8fc49d215c3b4655f..3afe49042e3506c905b1ab0310a8d1b71606e6e7 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 3e73a01fb6a3a80b9edf9dfd6ab3a96a86e438e1..c8b319f685bfb997288fa989e4a66f66c871ff41 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 92f8b9b9e04d3721fa3a135d958e61cdc7a72c87..ab08515dd9f609693db1fffc049f83d4c17bdd91 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 1c416fa660ec75304a82dd6271825412a812de03..684eaba8bef4841c22c138b429a681af92ec26bd 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 7d63fa87a3a992478958a26035bbc95899205d2b..009e17c7df53c1d1e028f3ca84ddf583dae7a994 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 fdbe328d601906b2e164361b23d9b7a0f5b6c65b..9efa1e4b2c1ca1d7fb130bdef3d8fb132af0d711 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 c5f920695ded1a034f81527ec3772a40c11bba0b..6929b04296c350482a7a0926a833a145ab280107 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 25f251685de92f5645377432c0aed4ca40dc33df..423951715309a9746173e15d9ca543b4565a7929 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 af8fd102d22d338ee88d721bc6ca6deaeff70729..826614f2d9efeade9379f8ed55f99abd8ac4b89c 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 6005657b6b0d7e3503722e3d1af9f63e3dbe9dfd..c767aca7907483260428a2b60e4919580aca6744 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 4c06a5c075a9f7135874f10a9d21f6c3a08959f7..d6cb606af7777b5e31bb8c81ba91dcb06c891155 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 d2df7c1d111beb008f2544fe51a1bc88847b03b7..1e2eddf3a22e53c85a4ed6921a0945ec79bf106e 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 45f06d0fa0e9ecee8389fe4244609b498b0e7852..3e44ef649c51a6d880360ae7dfc6a2ced84c41d5 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 5c62c54f88638c70fe654a76da06daaaf6d0557d..f7862235e303a19d869aeed4ef48d86a9c8fccc2 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 3d3a6e09033807e59b6cd1845243bec5beabfccd..e886b558898a263a2933fc5fd5ec4d8a49a6ff23 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 51cf6e0923d956b47d0dbc93a61596e61c89a1f8..ed94d781749590355237bf1aaa8f8b57f455b433 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 9708b777fa6482d5054bad152e1cb41e83ed3cdc..b84f34f1a57f534f2cc036c403327d2cb233bc53 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 eecc9fae4e9d5a8963852bc10099b55707432bd1..4279a4ab1e1e29a4cff299f5e078845e4195c439 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 4459053ee1b4d3a0f4c0f572801cc74a4d8e5bba..d710f55debb95273bd984b9e9b942bd355baaaf9 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 9aee289d6d74ebb06b9e0d0423cb32a9211599ae..d9eca795de8762d6e284a95d32858a1e39e4ee3d 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 0f87f20046180b408e1c452b5729e31394177f7c..a0846beb460f7f26b1154c486808bfdffd51c656 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 6fc2eed59f499df469eb1dbcf28b7e6ca928afce..1342e4c2e7cb69fa516cfa49c89eb26fbf02f6ff 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 9f465df52ca0c4fd8fb0bde972a07fb91639b7cd..aa491bb2bc750e87155b94edc1b1c32e19c192d8 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 895892b246254a3827f67f510eda2c4d4179a0a3..5f0118087a3e82b731f613d4975744f7f1e3c7f5 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 909f21b08309edf54cb33c3c53e43bcf602f2731..0cd136c400e3c36bcd975dd59e5007128b134077 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 006c9b09b0e89ddf7920e41b39da206af722fdb8..ba47f3e2669586a01acc720817d501ccc06f81b8 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 41fa4b2f25a6652100cdea4b890bdbc4b11720ed..9e22f8ef31ce5e7f2a54c8607cdb8f9c181693bf 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 3ca99d5e61f8d59b2bcae01ac0dcf88ae4860cf4..90dba4e681fae197d677f6f4c62fe17dcf53f47d 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 68c1a21f1c547fcb72108ff4f6bfb47917b968df..df8dc6ecb96c523a8de1d562c62193e71e75ae03 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 6155f8455070051948f0ae1ba71e10ad0b22183f..f3cded9e76a32eba3ea0535e9dc260e6b1cd4c07 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 f98996d214abd6018c3ecd4445c7c7e5977a997e..853c2e6e9ed55bddc8df93048ffb75e62dfc41ce 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 40bd30e1a114c03609fc87fc304019bd39ed7d90..2b6591e0ebc6cd2bf2810ed7e6ec1e2a88621a00 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 9e1f0000786fbaede10c8370d20e5fe689598ed2..ef237c0652486ee4f7e755bff1ee52dc372f6162 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 dadb3fa8be9544c24d1420ba2337fbc6dc78c990..d1eba035c151893ab51aa9e820a1e42068bdecb4 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 e7bc159243dd40595d2cf53697a46de0b1ddcf3c..79316352acbbb7414a384e0d59cbb2075a48096a 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 e521e8e7daf8f868ab85174964963434e377d78e..29d7ceb2879fb39eca62d1452a75b2f4db31eaad 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 85ad3ce661b1191f900b75f120b204eb6a6bc4cc..66ca0db0ea593528fe8488e3e81360bcda93f3ea 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 9fe718fb8934776f8e472db62def7bfea629034c..2920fb27d693490654b5b8714b662f488bc9e05a 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 e3107fc84707a1a341b1e7ea735a4500f5de0d47..77d140a6fe5a2cc4806ceeb6402e6e91d715102b 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 a7164120e0caa69c94c6a7cdf1cedbb992c39a86..28c0f00c54a94e26c5a495157cf30db1c2d7404e 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 a7cbecbe981b4be19ead1c5e51a09be0620626e1..3f18883c1d1f376cdcc1de3ea4dbf1f465797fce 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 b5f8ba3a5d6162332eb7956c445ef1c9feef561d..dc2009b5d20fe55bf3a9b5a76100870fbbcc937e 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 56c0df885f019664dd00813b6cc19ecd745ce8fe..a5b357b803de626be0789078d3bb04bb1f2932b5 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 3d029f14eab72c30b38866ab0076dfa0c400c70d..329609850df467935b1e8274ee098b3ff180f2a2 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 7bc8f6f8257e571d1c1def6d8456d7d5a011521c..fc1e30d81658031bd45ce22d19bb43b89f385b85 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 28ca9aa4ca4bea7beb317469f1e75504eee38bfb..a2d60ace10c24e970ef62eb1f68b767d05bdf064 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 6b5dbe5d0bc4251b85e07b0ba84ae793e9ca65d2..35122c8bf53fdfb82a875bd4bbf480929e65fa17 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 7d894ede63ecbf343f05d0e5d5cf41ff446d0e72..6d708ad1cc3cab3e72f0fd2eeacc903727fc00d9 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 847486498ebf85ebf8f2109eca35edf0a2ce63f9..7db317ab9fe564673322a4004fae675fa93915e1 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 68215a41b38f6b66ffdb85e86204d65e98d12de1..e56fb71d68cd0097b4500f2b1b8b81c68b3a0cd5 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 91bad2c867c609e6124b65d7f69bdf8efda48cfc..51c57f06a9c82adf9d2aa4e21bc66fdceb023607 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 3b509575c3869e5f39dfa5af8537cfb1a17359d7..396f014bd9f0bc5ca255af391725ec0b00e7ff6e 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 fead5400553c61e297133380290083640fd3e1c1..2a71d33c27687a863b2aedf95fb4b5ce596f0882 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 e7a88724c9db24212a25c4c6bdade45896fcb72b..6d68bedc94f0b690d0f8b327f62488b290680c4c 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 598fabeb5ab0a4638c04761bb4743ca5b2709745..49dda7cc91a9fa6d4933484f37667895dcae413c 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 b964927c370a9328ea7b9adf8e20072c1fbb5a32..09cb59c000ea514591c8e2033eb0270276dca67a 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 429c87abcd3809c3424ce146beeca82a94e9802e..7810e06e1e3dc08d91e413a35f8fbf4c048c6b9b 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 68153a0655448ef126b7b8924255acbcfaa6feb1..6347edf502d44143587f85378c7eae6a73dd8d9b 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 96e0b09524e1dbc82f2ad38ca52a97d626291a54..b7920a1123b8e5e77bf015fd1b8421d76faa74d6 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 bd692c7ffa9a2202aedbe428fda4cad25c9911d8..3488e2b471b875198f3d600b9ff1b6dea88a16fa 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 77837598c15f1ec5a4e09e9a32502b9b611feae6..96471a6dcfa7e4e94a81aa8cc5fbfa267ebc0b1f 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 67b18010a403e1943117cc285382958f1f037e00..364634f48e7c6aa71b192ca70e9ce028c6309c66 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 9cd7ef8325eb780565095e53d12f400d162e14fc..53282481ad03f5fd3f9c2c3c06c302eb798bf35a 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 87b347b0d195cf5d405cb8d46281961a9d9c8d8e..09cfcb44518f0216f7678b1cedcfcf0fe142f4b1 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 9bd0ee452b5debe61b735d7dc9b3b1176c614228..ae3c7d6e27513c15ace51de45ace17e994ab79f8 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 a3112c194cbbab6363817fb7ea7bd836626ed259..d99809600d186ab7c9aaf9ee244e0932caa6cd02 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 54a4df6f3d25c0752b674b9580f2dd28f6a34c30..d1d73ada950f8cc6bc4bd129d99926c184309bc9 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 556556454f3f61c41d68547efa4da2526ddd68e5..ce42e08b69dd7b92951d9117556bb23fa30c9868 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 d8d3ea37a76efbc45c3803bbe10b4a3a8d8d228c..d78466e83cf855ea785a9e4b69b4d220b791b910 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 6fb6fb00aeb4139bac996082dcec3213dfd25f98..598f7c04b8c1d85f7e9e2bacb5e6ed1ec091d5bf 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 ab25dda6a87a038fb3b5a51bb3a8c488fa037216..093a151f97189beab3588dfc072b97ec4c7bbfc9 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 946038cb0577c7997e4d9c4b935138dc4e42426a..c4c1ca9db1fe5e5894e653063d315d1761c24b46 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 a70dd50dc2ac661199b5715b073859a086641f5c..7abff4bbcc9096eb1706d47936b6685a01da6a80 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 c8cd2a16d7225767d3e884270e51162a52a8add4..bef242e500e02e704833d8f30942d83c3103d21f 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 6beb0a6b783c676a7899c3a59c24a0af6430d12a..5ad96bd9153f17f90690ebc885dc72b040bb422e 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 a2b16e665033f360877b112655ea2bcfa5b35074..19f54e3feb81a02381cd9c7d8e349898f52b847d 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 ca49dec32a422b1e88bd7864f67c876a8e3e7f39..c34eb7aff517d04a091c4185814b91ceace5b596 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 ca3b61d97efefb4c5eabfae2e2aa0fe72ec9b462..9e0180deaf1e8df536f656c0ac4380a615c41f68 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 f365f264a66bdafaafea39474493258258d4174a..f431c18dad13296b3a0161f64279ab9786511da1 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 afc307df76cee317916584a2867334f5781c9276..ca969eee985a8e11a857b51ac9bebd33d1eddaf4 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 3af6249e505509a87651e64b831445f76b48898f..d8da5f1f341870b2cded99cc92f1b0f2c32ef3c4 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 a914c0624aa1fa4d7b02b78dc736bce662db0c80..72a8e7e4a1aa2af2a73db6945fd54dd9356f9d47 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 c64c9f2f59c34e0c94177e265cff2fe3809fd8d7..e70905831fa28e754028d01d9aebf127b81ef5d9 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 541f79ed8482d167f91e72f05ca969ada4d8b346..6f2bcb417733a305a31f2d60deb901fd93769c94 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 7092d02577a03156141e5974c85056139740b9b5..f4968c29749090c2aceb5a00482b5736490d8963 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 753da383ba15156eba3a67e897e077e411ef8e1c..c2ccfaf0a662ebc5c14bd643532850c9e37ac3b5 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 7a97b9a5bb540e1159af15eaa2e7c8f375ac0499..285f30c8b38d846746ca607711c7ae25f6119576 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 7480fab4386e3ef562fdd7368df2a138252b8075..c5fe8d3831c80c1d83a779b89e1d600fd49d9173 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 7b5562c94b8a3496c2e5965042c92ad90b900c65..0a41ea33717f0637289aa05d3c2e277a599bfb76 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 843bd482e053eab389cb3614ef6c776ec5a70338..b21dd2b7102528c796f512256dac79874bd6587e 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 40157e1b53ba948be24e35c0c525af8024bf512a..af85a35e635d25a62785c9dfbe496f486d948f96 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 bc42e95e4676dc85d29a73c62171d9d9dc4a10f2..a6bc7f048f727743fe0ee1b514dde7ae26e934cf 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 c54e51d5d1eeea9321f4ff24eea13ea692fbc62c..2c7151a7b40f72dd925d734d856e1c18efba33a6 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 98d8c23e23cd551932af108bcd092d30759f68c6..4c7a5f6be7307b2c07b77f810d080ed04c39c305 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 3141e0c160594740550ed8e9aa98a8ef5bd87d02..bc42209cf81d314dbfb8ca37966270b7fa98ca09 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 69662e887c434b57814cc47bd44e5613f7ac1d4d..d572218f049512522de27c156754f02136565f55 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 e36492fc6aa6dcfa5d27377944b53b1fef5a4796..4e191fbbbf25b87ad68e6d81ed1c2315cf9f4b0c 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 19b6158e85cad44c054d115636678f94192f29f6..4b1b1e468472bec5d6fd2733b02215268e74f8a4 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 5e9d4c5748be22aa45aa0eee48a06c29e1ac9ea9..2150e1833fea0ba9d6819a33701d107d1e96c684 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 2aa36b2ab18b318efd85999ffbfb01397b2a75ab..264be5d90037f89eef4df37553e6f33d3267fb92 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 a38efa7b82fb3d12afacce7111a84cb3b4259ddb..a84c37fb42b36277a7879257d89f19093dfd43e5 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 d744b1a2ca9e1eaca82e12f6c68ffcf505873d6f..200447a70d3be91ce4492899879234ed2a76980c 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 6183ec98d4fb6ee6cf08f2aea868c284041b8042..aefb46b048050644e8dabb3c14d98a98e0469059 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 51b5c56a7a424db619fa90b77d80738e527d3abe..60166ea794cf15fc0cb615c6fd4589843ea4b11a 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 57d275ab219248c7ecc4d6e60f77cc7c89b87fca..ee458ef185a2d90ad6e4d16419089e931f75712a 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 2a80ab00249903da14574be64de3bd1967059173..710e9e56b2effaedffd9a03ada996b47dde5fc75 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 082be95f2bd8f1964a61078df9692fdd8107cb4e..cae356b118c7eec621e5d2e9b62e72d88b72f323 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 e99f81bcfae92f99e0c5411a7fa881f7940b9db3..a92cf59ebb16c6cc69e94dd1623b58b48486f21c 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 1bea5b5bfb066b128d4e2b9f56b08f67ce349d32..b5320549c0123403913d1d2750c2698bd037c12c 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 c48f2977868fb84b65b93c20b70524ba889d24dd..38c6cb0587dc3644a53b04601c829408a2cfcf07 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 54c6ad3f8cc1ba901a9e22b6391e080446bc2104..609322785bf781e2253ddd05f633618c927ba9eb 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 27b46bfbc04e5f9df07cf0425fbee4be43a27053..5b8ab8795171025c6404cddc677ed2c28c2bbfd1 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 a752c4c72ffcaef339a402a1d494f03917c018ba..1cbd3aeb336a6251ffd51828eb4dafe61692e5c2 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 0d4695c79b707b127dd0e8b620d6c1f4c15ea8b5..618b1a5be18ad2e81f856a3a1312c593ff9aedb9 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 5ee88cc12b7d795d8f80387225d4af21fde654b2..dc97dbe1809275f8b81ab30ece300a8c16f16453 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 7df29e56ad3ee1bdb23d15e3784dcf665fceafa8..4b7ddac4e87ea41ceac05f7138a094232af43171 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 3a31755617a36045a574fe2583b4330b44833edb..1ede54c185d14accb1102aef1766b803c65568cf 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 3a31755617a36045a574fe2583b4330b44833edb..1ede54c185d14accb1102aef1766b803c65568cf 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 3d779630f9d0f67312d43b7e2cf8f85fb406e77e..0753cc248fa5fc4034bce8e3cb7c09afe55cf58b 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 2ff29036b13f288e3b4754f203ae90760570787b..1f38fe65aeecdb573fa699fd55215984b445133c 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 db662fd1a16af5049fff2aff30eb8e8604719972..f289c65badba2084991cb187548b2e0d0378623f 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 256d3a54823901db24cc993ca9739da11f9fee1e..9e18cbe60e501efc7e22f5b8028d2d224527e101 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 e655d4d6c13b99856a39718b4fdfcec70cbc66d1..d4282f16fb13126ebcb6d15e057e4477cde08eb6 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 57c304ce134405a981e8194284138c669e263817..067dad9f116611d1babc208a23ee38353bb739c2 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 c72dc447b56e7f069b33f0c16347953359a2494f..ab03e9edc658804b78f0a5470ca9fad9c8d3ccac 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 d7d6c3cd57b970e7fa8411b7da88f41ad644cd40..0274ddc1fd2e39fd6156b2d56e8ddeb183c5fbc0 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 42871d17b3fffcf860bb3d1a2743b99631ce51b1..74e5cd91646fe8e97c2dd34fa6112137b0c20ac6 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 1149704dc8f6e64908ca20a9bf12da476580100b..a0a32472aca881c2b12bbe4862ed7d9624f42205 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 61ff3481e35cb4fe995c98319c3b6b499f5e1627..d87cc7cf0dc8f543660e9b3540f637822e8cbdb2 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 89684e1c24c94d76c1abd7098be60f029553fa78..0fcb45ffa8aea00a706b1171e1ba7e819642e103 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 e23385e207df73079cb3d196741b1e7748948b00..0acbe8f4d1d21cd1b99514f74a6c49feab571250 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 93f71509e7ff67598c5e41642510a5cd0af2a762..3afbe967ff052c3a4969a440e9ba073170812e03 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 a6a461ba6c9bdbc554c40cee20e382c59d9de86d..13c015c5c41a0d85b0bce1aaa308b277d1dcabe1 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 85a537e3d6047ce8a6cedac65c7e62990f053729..2d67cde47569f1953c304b1d4138b9c63a0a962f 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 d296cdf2755453894970d0e6638989e8714e47ca..0de6d63063a2e85ed7e60490e02f485957c0b932 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 25dec3aad40800cabb706273919d98ce91ef4b49..a62558a8a08a023ffa3fca424176f1c578596d93 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 4f36719c26fe0dc2fff0541efc0ed33817e87837..11e1e3062f5b7b8902500b2fe9b400784815024c 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 f60934d6bd7385884a51796d989cabe629d8a480..c3febbec039b8eded8718fb988af20c00bd9bd4e 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 e1f25c97d57b21d692a307f4fc96e54685ee62b3..37601e039c0caac53b557664ae4d535a8f5bfe13 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 1ff5dc954bed10be8ebc75013e881349a3ec1f28..31589a84dae86c07ce4372d93c9903c156f7d789 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 e7d4f672a00df938ff864171368917fcf4b3d0bb..29086a86d0daf4ec9878da8da9cba9adb7846484 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 492e8c4abc1f11fe4b63d090a6451e2286365c43..9280b3258bd87758c06ed651301354bab07432f8 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 8a14cef0675d1e9367d8e207684913a14f6e8a1e..82d3fdea90404216164277bbf125abb58151d1ec 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 147a18316f212fd9bc3ef5f57433150734dce943..8e9edbf141e60c0fed78c509a1f7ec29b725c6e5 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 1469e52ed600707edae91994e42beeff5cbbd8b8..294bf480782eb1f8aebb099f710f4607a7e29886 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 58ea587ca6b9833f2eee30b9c65c87ea48294aff..4b7a2748e95fc6e7b31f07de603bc7cb475c9ee2 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 fc7f470f6da667017d2dceb26c0f94222403dc31..17f1bfde042f68cac628b396207d6bde205f5722 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 0c1abf192c156f8396eda2756f70157e5882c4e8..06bb3e57c5a78829822ffc251baf6edca9ae3010 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 0cc48e117a727f526968e69db1235431cb903cb0..08847387ca913e343cc84f8aef52bfb755c1abe0 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 4d00330a14101e5b099fc0f6d2367fd8bacf3f6f..36d5eead96feb86ea33471cd26a99fdce31cd0e3 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 aca1a2a69b5f386354e4abb0a9e3eaa7b097ceb3..9e7037cf026278c6f75fb1d22ca309218897a650 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 e5151fc9614e9f0e2b40c60f178295a478766d54..e548bd2b89cfa45e25581990bec5efd756d92bc6 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 e604f2997f8089d03facb1785b1041b962168789..2473e7e4b33df1387e75963f193d70343c707c6c 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 d454e1db75e552e90e4063c0f72f73ef6a33d887..cd18e6846ef0735868c1e60a0810cc8d29505f5c 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 c61b67fb4b918efbc39e62056030827fe775b9d3..5610c90c9cd30ce053bd866184d534d9800eca16 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 632200a77f65d9586ff7ed36a5c512a6a9ac87fc..f3239e42a853ec94f4d12a06cc0115c38457ce17 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 69b2148fdfcf62c73bf26a03bf73630709260bea..e203df5654cec87cb57c07cf3e653465b2416d2d 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 a6d2fa0c3da170998ba24ae0ffc0797546bcf291..fe6c95bf21ce40cff2356df60463511153ba17c8 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 54ebb6d22ea3177a3b01c91cb44748df1f3da417..fd555b7de2cec5bb7e15ab23ece33b3a37a01874 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 b60f26e071e25715c2f8e341aae5e0e7b198a06f..686663cfa82ca3fd36785f3bf202c859de777031 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 567b5d5a56899185954095707edce5c8e7923cf2..13b7ba2c6209de4d2eb2e953e837d56f567e352c 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 e372dca1d80d2863db157945ec6636a46318d1c9..22f1d4e55a46b69c9e1431170b2b116b8fbf35ee 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 90df022c7f1d8d4e07a023d6c83a2a7e550612f0..9100c5632a23248b63ac7f3cf4ebf6a909014f64 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 fe4466fd04549127f2501f3a8e594e4ef32c2683..58380687fa0cb375240989b2f09a249c648a5ff9 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 8385d563f5d21e8a8a044b898e1aaef7eab5444e..734ff3883dbe0dd79cb76e9eb32927ffee1c18d5 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 ef889a041181c912a2415f62410a54aff99f191e..aec81d644498023790a50628a76f9da9350bf9ca 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 dcfda7b8c9beea3c43fb92408024c4d39a4965f2..6596091fc86688f5e7b0c59ae3db05d319e6f428 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 2262ac0de792e0fb831aa086a5d5900d9323c97c..c303cc33b913e0bd68800d6c9827a59cd3e5b7fc 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 a1d22707cc34151a1261a48884d6f2abd132a178..8d1cd5305eab2e42d96460fe623c517d8b747ef8 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 73d1c5912dc5c2952a7cc30d77b5bd4102605f98..eda130109f5e7d9b236edc4825186cd5ce3b87be 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 35984af465b8035330edbe62b23a3b447d3330c5..e7f4792f8a064dbb3b1adca0e8000a256250ec48 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 4d7bbb44e84dac930c0943155cc418de59ed91a6..ef65613050183ffce9db14ec17ff144bc70863b8 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 aeddd22b977b9d1007cc6805a886a6f66608eac1..3c1b5eca6e94baec6d6f74f09a9a867ec6e45a1a 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 09495f17e274a3244afdc91e1fc4ce8e7a66ed29..cbdb32871ac7a99173615cfd3e6e40e36fe51126 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 5d58f0bba799d40ec2950738bf5868ccc3dd650e..3fba717eafc23bb0bf283cb050b0943e567242f7 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 54c6f3ffe48e7dcef539d685c98103a0047a335b..5e6d6aa799a6c993bfa8e394544e298e12dd3518 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 e13970db02d837568c6e21f85c268954decd7a78..4c01c08a481d3e868700953e9eb0f87743b579a9 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 a1a6f7ceecac66e1cca566f0f921ab151cad9f92..b843bb70a7000705d21b28d89c602d89b9f610e1 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 e71797ffb128c6b4299d4ab482c196327ea48848..59522039a408649c52ad2a0f4029cebeb7852e45 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 60e6ec45842b5042c1c25e0bec232cb296427817..d2855b821940b04316ca8e4ffa437e332d3b1b06 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 53c51bc66f8734309ac505f16295dcd29b07d1fd..541bf36f6d24c6ce92ee640bd33a08a0c86e2ff3 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 ddff8824cb2d7aa1101381ace13f1893cd02f11a..b70544ce971541b3e8da8e1ee58c754a0052e788 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 e0bd19efdd3e58326312056d5a6f4da384be4352..f15e9f29d5fb754cf057a148d400d7922eb4d52a 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 61f68f82d86e3f4824e9ad9d0d5cb162a0390236..6d6e72883b660d6ed298835242c737bd66dc7254 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 06e3ab7ab25e85044561185dac8f87ad82381075..efe5b4720f4f750ade6bd655399fb3e6eb870fe6 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 9cb05cddb43d8f3691a81a583ac940a254fb23a1..9abd9ebe04db319e728b9c256d4d708dd83eab54 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 e6336e3145fd0246bdbf2d339c0c03f0a316e753..c007e5aebe125f9a1e9f1b5c04543fb0c1fbf84d 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 6c445f2c82e59502e738804cf79da3db051d4a01..e35b332c6ae5df0473185dbb4d4e184455742772 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 aff176b9df70e3fd79d3538d66cf7d2be4a4b2f6..af0fd609fbd70723fb4bb08c56dac29b7a9e85ca 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 1925e947cf0dbe12bb95506165741b13d8a947ef..faf80c044b31c70837888c8532eb1dfedf709cb0 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 876d762db04e5929d1e8d7958f3b488be4bdd982..5a9b691c1b656038694ca3467a1c7f93da114432 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 65622c8bac10128af104852dea73bcc82bc167ec..99b3f8195bafba380fe00d1d657d5c8d58451057 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 23f7578ff487f9fae98eaba5e74019eb92fc0ae9..bd3446a1d8d5d5798cfde572bf76306db16be2d0 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 92218c71f215e48b228e52ba9310665c1547f516..c2cf278267b7bc1af7fb1905e70d15dd67bd5006 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 3625027ae2662c41634902cc345c7aafba635fd4..36156b8a292801da7ad86c82669bbee297498c13 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 526f57c9002027f9edd3512aee558520d8377c57..3770e8e927ce8eae2dc3d53ce409c9790765115f 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 ff3598cad697f152c3df4fdd4a630336dfab6243..a46d53271318ee148c30e9ddc976b1bb5964eec6 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 0740d2a158b1cf7564bf55b77550366614c0d8f4..b9442ef16f46466c41538bba92335807dad43049 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 f13118e580399c7f501fc373edde47d218f503fe..52e1afd874dc28a4bfb96bdb59688e7e64ff1fe6 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 7871ecbb60e0fb1d7a2cc6ed0999414241dd2f0b..e35663b07501d67e52e0da15ae7c1da3028c7e85 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 9fa059af1f0b1d1ce01c0c4235eb497cfe27fcd6..414b243000aa24a2827f191d80742a9c2c72087d 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 b76b8509b9b737633cb7e5621fc2167a2a252ed3..4e69581a8654e7ce8fc5449573882e0fb96ea00a 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 9b2875545063ebfcffaf7dfd035d1220fd2a30ee..d5e1e4c25c94f1712ec0033eb0f6593548877469 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 3d30d84415eab55e26531f0d393d4c442a633066..253a848408c3b71b44544dcb91f6f94924ce36a9 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 82d918604f10e2e74371ab854e8ff77f28a47139..19312449ba2433b233443175c43b24c959d74291 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 55c20c37906aa73b98b68a74eb41d79f9d72be38..189372f25ac3f1dfac79dcab2c2aea5c1163c270 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 906bc57eabd5b19e699b906f37d9798da06bf231..976f70182425db67913e98b6965f48ae86af06c7 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 7173e67561002ac0bb6b033e8f0955187dc94174..0c1575922bfc7a35a7f916124fcbdb46121a8fd0 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 4c63ce773c04b5dba16597376d111a22b4e89126..06fc415c041195be9b8110275f303885307169b9 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 b8bcde84fecfebc4693d031d2f46d53aa222b209..68451cbb1b747023f75e8698f9760f3d3d6e1a61 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 e4165fa20d3b72b39280d08e0b0cddb572bc5135..5e15aafa6b1bf7aa8c43fa7c7c52d5e933febee3 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 8e7fae13a42bc354832e0a85347983a6bce3c5fe..d939a39556eb314d4814564d3e55532fd7feb47f 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 74334025a765aaf0430a9404e59b75b60105e42a..5003ea438467a3448054a2a8e9a8a3ea7e83a6af 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 98d8020f63e8c6bfa12447e231aeaf422adfa687..1794a2845b9f293d2fa073d684fd886b65e2414e 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 4a26a328f99fe129cb3ef245df2db8bbfbf0f13b..c7f0d633787648ef7790807ccfb7ff8f32630449 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 3fe7a7e6ffde2ab2413197885a4b125a1273c6a2..3a3c06931aecf597cfe3cb81e4233aaa25af66e8 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 6ea676faa0e0efd12555fa8973f79039d7145851..868dff9a6524fef318de05626af2371eefa0fc23 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 08973aff2a7ac5f620b3dcda993341756f1ee02d..e794d3b47c4aad9bf060503e644a3c0b7672102a 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 2203ccbe87e82080f8fa63cc00d2504690cd9f46..760b77e3479539ae3123b70385a78324097de1b1 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 ef1b3cdb07cad287ab41b07b0f6b5f1640a88618..098fe2456358d62422802be6d84903bdbb75fa08 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 d9bb2000b9b02a654008666e40dd296bb7a717aa..28f440351846f8af71b5e100a9504814638a9794 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 f7bc8dff30aac8f38bac10d2f699039c4dbb1679..bda0055d120d941e8dae440bc503eced3b9846bf 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 c68b048740a91e645035dfc065629b079948dca5..6473097cf398c485a1c55e2fb77b3896e77cd638 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 bdacfd5723e09ce7a5cc12be27f8814212058023..164422be804ae5b63563dda2b05d6b0786eb7a3b 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 1192acfa94b34f5ade220dc89dc4a3d0fda94757..5f3533903288a0591c9ac906e6ba0a0c6a9e89dc 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 cfec1f4e6e4bbbd736c65e9c5309a04dec5bacad..20882df345314e0c872c9614b8ed669089f22483 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 b2f268afbc953b9c9e9053020b9115f5b55275aa..91a3fcfc568104066daa06104429edc158597cea 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 7aaa9954c5b675e046ee89bb88bf0a76ffe6dbea..ad45a693909e3f42f60aecd23e5a9ac69742f12e 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 4f58d7b1aef3df856aa032288552f0c033c38634..40d1757a0233991ec1750c61a645c984c276a80d 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 af2a75424df0d452b7988c7f42af03097bd5ea53..667fd024a0baeb0d875a8ba45040b49fb1a3c73b 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 b86dd6091a36bf656e2d00ee94a37cf5b2ffbafa..a98a19c9634c0f4784c74ef9e0f13f030b1b3c7d 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 fab0f27850d8a15c9d46b10f9b754c4e9be4be86..0521655dc4daa96bc29871937c8b998a8fb8cdb7 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 9c73cbc043c1fd704a6da59fc70e4f1e76a01ca5..25df02b98def8cbe146d8d923909c02e63aca359 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 bb797e8ce27e426d37810d8651e6d9e92656f448..712fec27c5a7bc09d3f16b390e4e032be002f0e5 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 99b47aac95b4ad0c7b7d16fd826c278cf65bbd89..2437444121dcbae643324acb889a1756a52e95d2 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 f3463176647605dd732a4c06a69288fdaa86998d..84f2cbd171becd08fde2a9b80dedb0d66016b1ab 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 ac0659ab42adf430124625ea5c23139723f2e7e6..6817a1d3f3305be7b70e3374d8575af328040cf7 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 d664922543035385bfd368d8715fea94dc269ea5..f8a13297c007d99c81275d2ad691d685fcd2f92f 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 7739e8dc0e29dd6dca40e778665f6e81f6458b71..9e88edd8771af25287d3f9aa87031752a45dded5 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 612214ee670de3f9df3c62e8c8caea226af5f68c..b6d71ebeb1436dd837fa799413d7e35a59077221 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 995016cfd6e55c760e35dacb844439c46f89db8d..56b10fb30f97b51b5723988ae7560efdb11e8989 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 f4e746ef7622070650a3afed28260a1e100a3840..8a34f1b45a27b90edea81360463c6683958b7cce 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 d9b5662152346ca3d379511bbb1d8160ae7f1928..3ea457fd886ef2bf4702805f953bde9a47b796eb 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 5de7c1a619c68dade04d6774e22d50a340a8d306..73b936fecaa966e70eb30634faef87359a2dfe71 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 34b2d4c3f07e9422bd0f0f2afd4e03408cb03adc..897a1b3dd4a35ece6ce2a165769a772810de124a 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 bf9a212683fa661182ebeea1f7cf9569bbda18d7..a965a598b062bc6a100ecb5f6b087ca462581736 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 3b2299f960983f51bd90f190e4166da5cd7840a5..7861edf614a11d214187fa7bab15c8c40e6226af 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 1fce6e0512e1083b343d4d46d250260b3225ddfc..7299f508fcec56757aa6e723e07e07fca3d5de23 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 5fe86c7f05bcd2e86663be4c81bc952f88c873be..db562cc9847f14ef0afc182a477a02cb77bfb3b2 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 da3dca2d7e3000e6d4b39aade5beefaddbf6530f..d3cdafdb9d9d4facaaa6bba78ff487a3f45a7048 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 ae4b8bfd3e221a7f0c6043a768f7105c96778a4d..505ddb9bdb52bd373fb33c7f58e825b3278218fa 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 f499036204d37f35d378ce0d0d8bcfac4ed08742..35d7141e1a15583da62fffc027df56f001fec9b3 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 28806b7c2b275b02a2d29f6864a0e34df319accb..8a2e409f58834bf3b83797f5d8010d53140a5718 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 5150356081b82820d26898cbb48b251510a984e7..093cef7b7a1bd92c5ae2d8494abd8f6ba5986785 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 d5c026545c47873aba5ff6874fdeb9981038c5d4..e623ef3b858938436f6e1ccad889834583d9e58f 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 207ae574d59e3ec1c9dd494a23253b81bcd2c01e..2670bc4dc06bc25effa871876fdad9374f3c2695 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 5a928b269fc3a49af401c0173502f6d12c5566a7..8003b796213a1046f6e62967f112b3d5b4ef7d50 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 f1ab8ed283937d1d2490e450f5a55a5d422a3a10..00bb661f4ed7fb704b389bae2c032646ba4c2d42 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 5ba6d946fc59dad9ad170963f92f27fe63cd3f54..33a729cbde85681b18b20a78f406adde323f9d07 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 808193295bde34904fb79b5b9a3b2ff88f37ace2..17aafd0c0b5796f7e7f29105820bd8dc45c2aae1 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 67d5a75497b28e812f62891e8efca8199fd5815e..6f19d4a630c03d1200d1a8f6af2db1ecbfceb922 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 02719fb94e301235ce092aae71b06ea94c0b4f7a..a4dd9aa31f7c5e38d07b556c06b48abfdacd3291 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 5d921f8c5c4ded6c8a6adef10766ec1f5864d8cd..5f103a6e7e8814160ac1dbf177e53633e6abee58 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 372cd50450404eb1fd6f3cf4d81dc6bc142a98d2..b45af597358c9bc64d05b800a6cd9efbd642b8d1 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 645352677cc46ff28ead04deb8ab66c18013f45e..3ccfd8bfee1ff3b91fffcd877f12d6adebd94f78 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 291759f60bdc034a5ba95a18a560fe2fb71daec8..334b123e1cebfe34d5ba16660ede899cec3fdb20 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 ba1f3d8cc78c1ae5c5d4b87f7ac27151899c4de6..b11a57650841c10c1e6a13c986b4f4739a98b01c 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 ca1550a6edd05e43f9ce3f3e4e48c8035c503048..67f4f77d6712f7982e90055b1eeadf6cae0322d1 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 2f698cc8bdcae048ecf310a9acca8786988ae746..07d292a7a9e550a58b4f29c0b85454caedef31f0 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 268e6039ebdb0e53754dc16cc7fb0f394d866f7f..d2750fb667fca0b1f8ccad85b2dd8c41c0e536a5 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 790273c42202bdaaa1128a08da024b8302ea1f37..b6454a797fc0732e5d62a4982c817f818684de4f 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 866967575efbf029e9196e06307517faca4dd9a8..284fc55b6d3a288086e48927979b803d3bf65f46 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 bb7055ac6862df940e6ea7ab7c7538e1176ad1fc..4db6ca49fb5b01e9694563a36e3cc5fb9b8bd376 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 bff7b461199aa9df3215d8745c5ac0a0f03a0fcd..a5d784723727bbe3c507efa42b3d9921b0b22d02 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 1429b4c2b492a96350da170f0a3d7d962942677e..efcbbe0a4849910e6bb5455a9e0874dac5f702d7 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 ff823e526294d82e3986765a293113b131bac3d4..f51b89e165e3a625963595b04eb39010c19a4a27 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 99b404326d5b03d6155fdfe5d555c6f017bc3d0a..e71ab183c04d0339e808b447439ad199fd305205 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 4fe4bb5a90146f5ce194fc0fc6922daa68f04ad4..6a8fbe3cf601678771d2b9ffa7350c3669650ccd 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 4e2fae623f22b5bb6ab4b0d7422254dba67dc0e2..8edd78ab132984fa8f4abf68abf28deeef87d79d 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 566df000ae0a47916c5a85ba1d6baf3473227643..b28e4e87bf99d3447ab022c68401f8bbcf2e7717 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 82a8f975de530fb4074c1ecce7709617365df42a..00a7dd671113a06873f1b8393c7c5f2c6e07177d 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 486cc41cb0fa82694644f24e60af1a9909094363..22e10f17cdabd4fe060f9dbc914ff68f56f3c575 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 3f16d5cd065be9479cd808ba8598078f99833ccc..30b44682a6405077a23eedefa8e6ed74d9a9f769 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 b7f1ca5d5b157008016497de21a34b5f53bcf9fe..2f75e67847628f9f7e53f467a394a056d88594f9 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 4e2ebbff0839dba585f7d18b62b4b4800ba9e4e0..12359147a4db32d68d0002c7e3f0c64da308008a 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 d6e5176a5ca6e287b14563f5a827a11ec6c76292..c98882584b8c4930352cafbaaae2d7c24dd6fe00 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 7a3de04abac0b5ffcb7eb8da5fe74df56bc38475..3585765cbef605e1da60db46d31a10c90868c7a5 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 517bfee6a97aee60548290b5760f4df9c3b33f79..43027711d5de5237e5d41cf2942237f8af8e7847 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 95833160ff638f2b72cad820f0ee9117c57d2148..0d5c40af7a75f4d111d031fa24991910999c524e 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 ee13572a7a5fc3de1670b6cf6a04917d586f8071..69b00d196b7a885239c8bb286e32dee1a482ce68 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 f89cf1466342999a406d716618e97bf890bd580e..196efadda956cb8699538ab0cd3d40f3316fbb4d 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 f337701d2ec1aff0c6d56bb3faf53f095ae8f5c4..9d95806d46dbfc67221852e14461c056b7eb1fc4 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 99d95697952bb76b07bd9294b86dfb6bef817efb..168b1157b54c9d1c6979c46fa404b9aee1321793 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 07480043b5d3661cfca401b9e43ac9e6ddccab58..705de956ad9d41b0859c1db6f176d82daea95d0f 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 234f740d9e3f9f1210472a65d0de602a6c9a92d6..4b18174c1cdf7754dac0847ea354c538c50d7ce3 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 641f15902445a80dad8be8d8d88f1b675912d71d..29fb0acbc1f0d29ec8a1e2135cf3fee88837e861 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 13adb9973c88ab81345c106d54c46ad6dfba1008..fd10897fb8323885f3206aaacb9ed22919ff5436 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 c329b3a3794703acb16de39054645e44b0585d46..88cbbd164a591db07b559e86030c4ca386013ba9 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 11b156e5f8dc1a78613e07e8e400dc6065378163..d083041692bda4414be6ffdc0b858d262ab4b8bc 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 84a5db8b1663f79166aed0cc09dcda29dbafdd8e..1768e5ddd60b0c014fabbd3bc13ea2e57303a8c2 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 83d48045e88a5ef091d6ba43366880447c576656..ab082145f31007edda98c8bdaec3a996a1bf496b 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 4948a286e676c0ce3a162c21c09e2f680e4058a8..3662e48eeb26253b05bed55f8a8241aac245cb68 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 f8aa219476c8c4570f8b51872b809419ef050f16..db41f994209fb36665aae2a942ca4bbaf1b91aba 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 a2bfc39e514787e06b7711b339fbbcd8e96ebb47..57849364c37c2dc754e2c91fb77ced3399fffecb 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 d8eac38010b4dc6f46c671751c7037702cf6103a..ad786886a86f6be23f4f1463540ad28bc637c6de 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 c07faea1dac810dbc541e5844c35d61e9ca3cf6d..7f88c5286b09e70a7597d16794b9b2b260d9daf1 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 9306bec0db819c94564ac7a77e665140c1c6ed10..9ada6498abf5e4eaf28739f5daeb37f26ad9601b 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 4b1bf3a25ca5496172ff2c5c147bc85b2ca36978..8495938b1b7b51a12f062f37b58076951e3bc6e2 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 acbb59be363270eaa37630f1bb7da255f1175621..90f20031956a788f11d9e1bc493f40b53a2ad296 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 6823fb176e7d92f7344ee290d3808d39330afdfb..d9ba51f827d94d5b14cc90dc8496350e82ea592c 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 6f10a9ed0e44444e70e9982e5785966922542126..5d6cb9c5f0c0da1d5e4256a5435bb9c8c4ce5f6e 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 c3491a89ae43bd670ae907e8b9e5b598577a0658..bc8d365d29d2c5cb4e8e1220a82d0fd066c9a96c 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 ff56c8ecf83d0411b467a761d69bb2b1bad51288..7bd35b1c0d6c27fff839eec2cdd72926094fd918 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 8835b84b4ff37d40f45bd68499a03c523185d05c..965d2d908e422bad39a611186ae61804c23e02e3 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 25b14c99ff4775dcbf9efa0a79118377fac1cc76..5d95de0c179d95442ae0670edf04f447a8f742d6 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 2cd36db12740316d7829623dc0bd869e5c6e2134..5e8afbadb130f3f4bb05543caed4d62d393b9c70 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 65c45ef2cd6ecac4edbd5b9f1e1728d2a44e89cb..487f3d69cba1cb5113d02b5981bb99593ac9b7a0 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 75fa2f8e3a76dc9c9931f1941d84b16f03178894..c4dadfe8097b10066e60853a9c66705732e50e9c 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 e7e5b4d898b291512b999896060d389a188fcd25..9a56064aa0f0d8f2ca6d49e7072f5d55a8aa77a6 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 028d86b604a8f70840c101f14ec2538d9d02f401..0f23cf44ca3131ba022535db9503c3f007838884 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 5a1d8b2466048c10b4620c25a12b0db207060f6c..f8f9a7ffe847fc7a2b5b07a367fbf33777c8c292 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 407a4e34d5cb524f788ad1a783a9843e6e273c74..da3c51728a4002c3b6971c1d61bf524ecafc0507 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 4aa0e28d22415ea45a8bb2fd4ba2659defcdc5a8..467d199eb8ebae2a5ea2814ede0028435fb28b44 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 8d702f5f20cbba2fa015b98f1c55fce85d4fa189..e2cc82a99f92dc1bcb2b041448407afb7eaf8081 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 39fb1da06187b0180f0a2b94ed7c4650f1e7b044..1b7768057e631c39ebe98ce8beb770dc8a56cb24 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 63d2afa21aabc30d7f17af396e1fc75b26092841..41694bc275061d7fb67bbec6f2317e53d50a584c 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 9790e30919f6329156b9d24d9bd605d0b2b29bd4..e6d405873f876f66e8951cfa35397410b13133fd 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 c5e1de7a6b8458fb5a1f36ca20928c04519e30c1..2ef7b2a98f7a8df4111f5ccf18a1fc91ccbc6ca7 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 1aee4173ae6cc06520d5c33124c19bd57b891b26..a589d40ab2c2fdefa5737886aeecebe49156d7b2 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 48d755e43b96b5e6441730fbffc3c91f4a427fab..26aa29494564d65716c73314735955bb4ed87efa 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 747428abacf9c00afad84338d019c2282153d8e9..329ff4078d2965659f832dbe4b24f798a7e0e5d1 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 42e92ac917923a9bd687261cdaa7814c7febd82e..e94fbd63080e6162cb1aba5e33fe530ce9520ad1 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 09a19f5aea3e84fbf324c22aa107c2d8601d1305..80736c4caab0feaac973ab58fe21151435570205 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 223ce701c654f49ef98b03333f28bf6a56a7c92f..60170ad2aa3597f2bc932d79f1362670d4331d54 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 91d59db7e58ebc31cc6b58cbb61258a86bc0b371..1a695ca3d300bc013174e7a76797dc5b4f7ad57c 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 844d438821f1ca6d0c6e247b5c61f884bd137da5..9b53b14724c52d4809d100701f58827d848cc246 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 1c74d8e9f85fb39b98e29aafe0dbd02026fe45a3..9135e6dfb4933a223cd9a5753c1cb927f1de8dc9 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 8e5ab2e699d1a249d1181178a8aacb03e26c1111..d3849f67681923d1a5da1e4eee717a1a34ae3a2d 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 d5008bd41a2a794da99850e13e15745f017b0a0d..e796be0db2a640426d3ef0f4158df5583562b319 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 aabf3fca5ef2daca27993cab2154d44b4a239bb2..22b6688d0ec004695d3ba1c42e7f36857c2407eb 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 06a5ae8668c17be39fc3c783a3d3164a039a8f51..a6e9fc7854ab8e4ccbdae3eeae772bdfabca896a 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 aa67cc33a1083dd54099102c3b73f90db9d2ba06..e7b604e5290c734bb0c08c751486a840b544ebe2 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 e0f845e337a0ff29bbd89ffc6c6524c50f365ea4..f9ebfb46c657ae1121c50eca387c76ea9145c712 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 583fa8d9269454add1aab3c751ad2dec406894bc..18055fb1196c95f7bd3cc462d3fc987cc4cee767 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 fd1a2a448a85810ff7cb2f381ae199d59a1b9926..289b3e01dd3fdffbfd01b633228126e7a941b53b 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 e501a0db3e93b7bb3428a13d88482df40d46feb1..bd1411c800f4d7dac527ebb6c8d25c59c46a5351 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 537cb8d4ea1df837b4bd1b856f71a38dbc4256db..dcd38abd68569cbc3daed8f191461dfe21e717cb 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 4336f047fd78ff47b4a41c00c70d9bbddf667c42..f7875f73a08dbf47766a2e36fca46f97cbd463d3 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 bc29bcb7b60f8d14f359076de2d70375eb540fdb..03299f8d40254c7b7ff6ca6cbf17dbb6752d161d 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 93cfb9a6c2e6dd072f841ea3dea9a702f603f02a..336008da1eb077f299f45a9265ebe3f2d54b2b0f 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 59d6feb7a207ff52854b5eeb4a775c12b8d71d6c..21cbf729dec68f7f4b618c1b89b1d84812f94fa7 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 9e517d9edb508a731a79d6462baf9c34a31dbdb9..b096817b15e0fd0fec9a597920b3b818132d52c9 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 208761c25cce4ef23114881b49ba149e29f70f2c..468f74c33c61e5212c8467efeb2225562791ec02 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 903f8b93aa507a6fca8b9b24655ab02d4b2de43f..588e24a8342f3d2c68d7cb4e9ae040313a2840b3 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 c8464c6ad07751d9ab93eb9314d515b5e63bf289..3b31c71813d9af4339196aed318ea240de70a9b9 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 82a5c2fd4cc71670be5810a16352828f05f7d453..f6601d26533d96c821ef206e46717b3f1a705957 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 6805bd04ab0980b473b11bbd3157d87119a0b360..a25290cbec5a3fd84db4b3011f9ea3c0ca0be468 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 0be49453e11983fcc2c1a473d8eaeeb39f163533..e1677b9444028bdd626a002c5458335e8828cab6 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 56b211c95f5cf12cd65e2b9a52852431d046f28e..f6888c8649c8e5aa03c361a3e65df505b78590d4 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 78c20734934ab571745491caa058b12107305d16..cd3c6e0256af4bad0a4d70ce5d978edf709b98d6 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 7a4734bead85c26f64d31cb30b2d0387336fa2f9..5bd9fd49e17c880cbfe1c1f19c0eb921592decc9 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 7a1878be00b8698d55b008ab723338cd4ea2ef66..51feda7a0019ccfeb47f5043dcc73a9544d725be 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 bc5e3694ac1f693eda94377d8bfe57def7134143..11e9a85441746c4a59dcff2709a20b39d0f4fa40 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 c058dd759b8691d5217094dcbbe7bc8717c62a22..1529474d0a457a4803f2e88a3d01027fa9458e95 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 6859ff07723be219e8f95bec901a02668dd8392c..03932ae8790e2429e917672043eb5da9fcb19e05 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 2ffa429913a042a6b58e881bd11d660d5430f3ef..ef1c1d0b8743c838d7cbd7a063186ed29395f4de 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 d98ef8955a0026f7a1579673404f3625d6e61cab..4b623515ac1d1354efbf5f4bb5f2e104f8054868 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 7e3f33bd3bbfdae6534d3b8659b19faef3128afb..2120739e5b37f3d80ce9c71a885bc9a92fce5274 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 64151008f58879ae6c09455e3e50c4f316f54e2f..cd7c46ca7bc4a145b5713439f11ea260a3eeb392 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 e777febe93be2d63d76c9ac181a47d4338c65390..b90ca57f517bd9709462cb247f28fae6579d34f2 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 f12701c0c512996883ede62b300807d9fb43fc79..9d8209403d27ce4c99e2f0a4207a49b204408691 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 b598b3f7cc9e1af4385e780ee6634e4b289a474a..5e871507ae86f7d8f8954bbece39147176ca6419 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 4a1d810af900696fb1ca89a48eeb0d336504ab99..ba5f8eaa16252a70b74f54b29ec532384d4ca5bb 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 1992f4004bc4ccdffc4c7c3d5835688e9dca505f..87b85e3ae604b7e59ba22ec70ca625a70b7f50f1 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 a069c2d2a7daf7c2d0c54a15da50086fa5dda432..eeb8acc422fcda0223731f5e81390da792dbdfa3 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 cf1cd2d601edaf4a685d5af82f6e804b3a94c228..d8ef00a4d5016752a1d4e588f4a385ab5df25be2 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 0144af933e874849b7f0472d085b35725c4547d9..814542201dc8d75b399c2cacea3c62e29761b0fa 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 4490b66233ce431817691fca9461dac42622a615..a8bb0dc5f770de54aa521c97ff43c1036d0a79f3 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 773800694dd534504b5b97639b48b26536f42363..41184e4a17049338b97252211fcef0b8eb1e53b5 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 c0efcfa1ce957d57904bb4911c0f71aaf00fffe0..9d62139275a2cd3d2691bd722895bc3098bd9e6c 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 04bcc1a260f046f51c03fb7f03a41e8dd36c41f5..eab759d679e08c635dee69b6ea9988e1aedf129f 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 5df5b16c4d08614111b6541f3d28ca77cbc5a762..87edc245bfbe863cd0b07f09bc8b00ea051931da 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 ff0b699ba26561900562e22deece89b16392194c..eb032116e9d104e6b342c961f1545d90366b09b2 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 d6fb6d632903dbb637821a88368c82f9c542f9b2..6417b980b610933dc782adb9dc924948c63a3436 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 fe9157aea73e6f74b00ffc20338bd96555d8ef2e..ca90196d01b52c2876d25b9016cd34a3a09c1265 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 1610bf7397e203a60a837608e32afbfb08ba4875..83cfab462469ee305657ecc65d3c5f6f184a82d9 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 b1ce7f52365330a8f6b3398b5fce8636dc382c62..bb06a515d7c166ff55770986cd2c4804c9fc8313 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 d4ad01a64f9d4d3c1d7b6d62fd351fc755e8e2ea..b44bf35b472096e17f4a3b02bb9ad578937dc7e9 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 78aa6e6d0bf85dbd45a21484abb5747b5430bb71..b424805f75c4773d03c0db88b1e66031403225e6 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 e35fb67a8b9d75734d662965e3dcb8c1af1e421a..b4e882a5f6d2264176c37ec49533cd1539a0ccbd 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 6fbb830a2365e0d13ff6c461a5983352effa9f45..80e6323f2d41338732ed55e496e71639b5e85aa3 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 07e012f98ee65fb9e2f0bdc109b07fb518547489..0a77aaefd594d491175ce33fbefbde6dcabd2231 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 005c93bb3d8a9765c1ddb6396dddd77a1ccdcdd2..9a68e179cd61e1d24490dc4ee18864d71a7e6f32 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 7357f3a6fdabbbefe77fdfac090ae1d33a7bee0f..d1a090e3325e59682dafb19bc31a95718710ba98 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 c44ddac15aa0d9660900ad1f0a33bec2876443e8..0501ee95b442a73e856a72fadeffc2a04fd22dd7 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 80b43043a457b60468c0ee26b4d3a52dc5d341c4..6a3f4a8505e6696ae36a7e189f7a00ba95b2d438 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 2fd0c0923dfc3095260f9e124ad5d9e9e2a70c62..da3e2d67ecc31839dc541d87f2ac435ee39885fd 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 35b4fdc0999efff52f41562b82877364bed0cc9a..a21714d9b86a8667891d71c49084454788a59a81 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 014627e83185c910304ee553f115e898d5422a19..c3626d085fc9950c4cbd4bde61ed8cdb734322e1 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 de6d5d57f67a26822707b622ad575ea6d46c82c0..6339428989f4514f09bd69b1ed2caaba95a2fbdc 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 b55a4699a4cf527c3a68407610d143b10887f3bb..1d484f8f6036379dc8fb79145f1bda966e003572 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 2186d42ddf73934092487103b7a6e9bc0debd316..3909c4bb409c5f92f0066fd7b3edcfeec57da11e 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 98334e64370a1275d4ce1123af0ed3a375503fe8..28f69354aca2924a272dcb89e52743bf6bfe06c2 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 235b9afd19fe1118a106eb142b7552c859229285..66eef8cec9482f19570a5fcfca6543f0b180f6c3 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 cae079b2d78447e07b97861e347014f07b18a7a4..f4315ad71ad351b13a64f73d1aa1fa99e505e66a 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 3381fe8cc6f57f0e9961c0b3f69509e353fda84b..d302980a649408518c48a0ef622f226b3a930e62 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 14e12ca69092551cae105b4a3b31ec76a1c02e07..ed9dd1d5b72a0865c02530069b6768bbf290f6a8 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 0edc2f45a2fe1e39a0f2ff957655fa5c9eafb429..82172a60410fd80ea86dcc935e11bb69244a5b45 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 d13af25cab7215a96d1c336ed128b888f3223496..6e472ce90b27c90a408ba8c1a896ce4d5ac690bf 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 9f7df955c9f77d080e95605e13bbf6a11f0c7a3a..30c3346129d97638a1fb58bc35617841d0ebdad1 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 f310f2f7b7175ca97c80b2c760d023f36f4a416d..cff8b23595c2233956938cbc8c27585f571392ac 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 468531b33a76faa3e87547f2970a2ad963ba71c6..6d7451accf2561fff599bbdc6b589b624887ab99 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 ccb8ecf3ab7feff6edb5ecf0ab4b644b54f9b4f4..cd4f922de240928030261eed5ee4e897f467bb34 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 4d521f68e27e6b94baa819902ec00f9e94bdb190..9e22924ed71f2ba7b65b1b0d90474c472fb78d09 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 e92b29042f49f92345adfb31359ca705172319b3..41fef5868b9c98f7e846b1b0ea7bd6e4681c95ba 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 6992fc3835db1655190eb1526fa5d7e37401f593..e83eb0c62fc25841fc004136f585411b98ac2652 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 221e0821eca278fe1bed72d1093cef8b73ff407c..868449ee003abeaa71d68d860e8ffd82a24b1d96 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 3cf360d7fb622597f42abad83a53c1ad427295fa..66b9de9ea64fc8848c9d364889f89b143ecce7ed 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 c7dc38f611f9b7d582730f09c850dec7284dc7f0..f59e2704af45fb2f6320693a6576256fdf3240a8 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 a20524034a8401d4c68d18b62b98a7081af5dc96..263a99090e6a8a48af3b939a6f7b6fceb6def34c 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 a22c644dca051b8a720ba1cc9b1caa141017afa6..f4233e536047cc461d4eaea7114eb82f8d42ee96 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 62e60cc71c47ddb8249b44d7d440114be959a01b..6c81c365be4232ec5692dc79abcdf2048b798aea 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 a45d341ba670ab588b5f230d0f044c33d59034cb..05e0718ce7c82dd2ecbaa088bc7c68ac6dd4ce2f 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 a56157ed008cdf70a2a71f8c722ac59cf1d46b2f..a91df0a3d2b45e4eb5c70c451194cae2849d7278 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 32196dd8b985231dd67289f5107e2f9b384a5ac2..4eb9ea87808994162e3448e5276d770db34a74b4 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 d5a3b82651922d054d4b937238daf9f0da82c507..da4d1d7140822fc54fdcf0d640a5099d78f13af2 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 7fecde9a3d57471558d69a9cb53aeb68909e91f4..48223bb14a8ce05393c1c88d4d648123ef398303 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 4ff288e4844be7d777c30b01d557600ce9a35ce9..ea53866275f83817a7603f831b961f61442962e1 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 e3f3c92817d0ca466a75c40d16062b1b25f3e18c..5d816932c73187d912a94463756f0fbcf3205f02 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 2b5f953a89aea79b58730d05941709691db130fb..05d2ac83cb20e31f4a7cd687f575708c2ed3d8a8 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 167222da6c9eee2b1cd6eb29a7301ed938b0217f..2f17fed0b8545692eec6360ef69ba0b2751c806f 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 b31cb37fa47a39ac60a77d31d84e6102d17c3d91..c2c38d6215a9ed1cef461f5dda1928d90f7b54be 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 1c872a8792504fe798daef104cf1e0213e507cb6..3baa4ef65dc9eb09156b3c77dd902e9f9b66b491 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 113dc3f6222d2a34bffea6745726c6a55aa41cf4..62666d3d3aa7926f0ef8573598b1748a300ca317 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 2fed08f743caa1aaa476684c7ad95844096d1ec1..1ffde388e0826b8ff64a0826c8de3dfec21490d5 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 98d29376a945b86047a4336b65d527954116348a..3cb463d85c8793bbcd2a8d7b6f04b26f8489086a 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 ac0a5d398fcc1fec6b41275653cebc76947d902e..b9854ec3f270feefb3e292d110a24b2ea9b7babd 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 8a1b8ce8a65af428ac711b7f99750f431e9e1dd3..5db261aa15fab4d8a09843739b4a425dd1a6b38e 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 5646c7bccde165efd0501b3afdb22e1463c450cf..f634b8bf10d0a1b77ba758dd203f3af7079e4904 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 237e32d66faf9436dc5f98697f789c46fe5aa5b4..53879abb9fd33b35aa9e9c1ca98ca9a2f811a178 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 da7c48a09d5d04c61c711d83cf15251039e82e88..afa72d9af41b2ba433ff08b8339725af3e7f3779 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 bb01a161b5704f63b439f0e0ae055b676e696a27..c0713e16b1b493b4e7a77833452580757e11ad4c 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 6f2a5f631ab48ed09b2a7ff9c1943924a8bf1aa6..a18bcd21cbf5d874ff317d6c7653fec4d196b871 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 8ccf2f3141d2ebf1308b00eeed6f80757aa0db1a..c39b53d3121da42ebecf5ed0df9cea7554286699 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 bdbb5b229af5f39b41eab6d83074ab3aa280796a..a74a434d37fa85c422324d7f20f1a18743af69fb 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 995feb06f391471f5e3cbf5c61c91d1597c45b85..db66130c713b37834103cb2f7b01aa25fe3486ac 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 cb4040ef822fe355b778464e5ea48780eaefda95..8e945a51d2d477fe842ec384677e841a4dc7e1e4 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 4d3c51a5ffa6ea12bb4a8aa43de010dc1462e0ea..0069b99f042bee4572bbc61332c7ec4ebc599296 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 aba09edc98589c18e80163cab5188294055b6372..dcc83462a091c4359a02d96b6f8e8e27320d9e3d 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 6570d4e8da35b4524c63599f1dcfeded90c525e8..9fedf98effe5579c1b4ccc939ad918027d744107 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 11783f5652943bd32781d8965f87b2f9eb5d9639..9760c7596ad4ca5583a5d409e957cc1d3481d01e 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 d4664da4222b57470d7db55f51fb7008fc3c2901..42564278212886174662dce363a50308f1b62809 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 bc1df0013a4a2fbbaf73cb165b24fb2aedb56d5f..3e4babf3c4ed26b1b3a49822417d9c4337fdc92b 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 f2a22b3f38926331acc3336201e8e6310cac0bf0..6495ae0b4f02ae83eef9a01b5fa2b3b87383c076 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 2554b724aacdd853eaf2e058e92893be3ece8965..4eab3a9dedc97ea3d044ef354a584b983ebc6081 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 4a19b0a255cfebb43bd0550bdc46c99ae920b47d..da99ecd650f42f49bea5c0576b93720cada09917 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 4acbe0d3a7e82a161e8210346a7277c03e8b1b17..570954ff632b1eaed8c94f67f4989bc3faa5fce5 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 b6aab70639517d3e79cc4440fe614d56fd98f083..a0b4062d3bed792fe14ffde02d1aea9072a190c4 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 99d86cf97fbdeba6951e85c2348d6579f9c9504b..fd61c85ce98a363bd472bc50e1e4f8481f04ddf4 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 934137ee57e048fba7635f536262d48fdc213880..efa7305b6119b770b0008efe575c7301832422f3 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 001c83e4f563a9d0dca2ef13d78ba241625cfdc9..8548824a95760e419fd60d0e7a6764d0bb6d0ccf 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 4e6b606f27526993adb56f2ea866a5e11b67e832..7a54c3a789c4745347ccf3d5913d413532f1303a 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 c30383cbdfdddd21c6d69e5d5c95f014fa55992f..d1ceddaca493e890c4b29bd70945bec3f0452a14 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 1a09df8349a512112668e60ab24aae70bdcd76ef..25432aea872625e3a1bef7d9678638fb1eebd14c 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 59d9ac24fadb1178d3716c0faf7cb42cf4218644..bd6d76b03278c31895547ed21dab0574718be83d 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 2d730e87079811fe2f4055558cda57e5c7329528..55eb89cda4e744eefb3f49eed148dd83715fc03b 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 94a88d9a224bd428f24ca24f11a9bee7717180f5..99b7a1f652b27689d5af8e6877648bd67b1c9d47 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 9ba451d2030e07f3c1448dfe6c5ac8bc04e991de..10dd97c8c92ea2950594d02ac42aa8f271c368f9 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 02d3ff18af5e923ce8215517d095efe442773344..d2d428d868009c8202f8a7ddfd66468b52665769 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 3ea0d3dcd4f503f0c338dd97e488754535257426..392c4f399074b342a4734ed0eb28495ddff4240a 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 ba00efe80d26308caf8f12a3656f2b1f13d0d184..ca42244f987b4c15cd3ec8824441b487383cbe28 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 3eda42599af49824deb180c37b713f230c2f6f3f..301ea4bdda2e0afd651b24ffa5f4d53d7b6ddd8c 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 2e65dced62706fb1e7729b16dafd60d99f070355..456ec61e190c16d1c0c7954461bad6c19154eb31 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 e6dfe3cf53bd26fe95e31cef83bc6b2fa89ba657..560ee32e0bd1f67d703ef8b0dd69bc030c3e58f7 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 e78e7312170eda05e4d877de58e14692196904d6..8aede9c9e361acc5d973ea0a3da253e03278fe7e 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 6e6116857e0e94c8e186a57cfd05f3c8f63a0177..a6556e8be1d20e9f844da6a9f4b45add7b8ec7f7 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 9d2baf17c6d70a83df94646837b03bc5db6778a5..895218c6f403aafd03cfab1927a831a0c9943455 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 d8f93001ea3a523463f30e93a31510e72392560d..7ff0a9859f3525e7565938bbf03b8d95ad6f47ce 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 fa7c9c4e385bef7ab27739d07da973d9ac932634..e11d8b48ad1cee9c94b3a21b201df79788628bea 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 d839e77cb2c64ab4858fac5cbfc9b26fec8a4b2a..f413fb97d9802637d22338faec9981b8abd2c913 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 ddc8ede129eefcf0a7f00b786b3c35e5f5300815..c50998d6989208aea464862377689b028982e82c 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 a4f272fb43c61b5d6eae1f5712318f428cf75211..cfc9df8f9b2f61c644ab1da2b04fd704dcf7f0db 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 a20e979628f986cf70c13e98e64c867e2060ef5d..fbfffffec1c271c61ed8f50d83c2d9322d360625 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 89e7bd508c2213b5c8f1a02206da9decab09e003..9ac96ce3b5a135ddffd04c8349d5c19ce4b16448 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 04ec6d37f6831ee929d84ad8678ce3a30058ddd9..3d77a12175c50d19b60363eb6a5011a5c99eb057 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 dd3d70ea52b97e4673b3048f954b1f8b3f6958b3..303eebdc81cf5dfc102bc3183651940449b7fed6 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 b2cc945bdd467641091a78b3e04c2c4cf162d736..6d37c628d55389954d0add32508ec35fd734064a 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 22e9eae028b36ca062ec039f6a6c826fcf28f0b7..d624ed0102f17fc89d5bdefea1cec11d66a21f46 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 010bb5d881cc5ae8bedf98e8548d73b7365414e5..ef3897d0fcf546bbadb60ae1cf9f19386daa29ce 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 1909b9dac8b4afed3679e5aee51dfb0321cbab7c..2e1bc8a29415d0620cd72f209d19187a4de3266c 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 488ebd637b05e6cd9cb71ca2ee6615622a270f9b..9314ce10dab29611b20b61df7605a4a48dad8799 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 21329e76e9578f25fa184b6a45c4d08ef5990294..54767e6b5b62a8edea4e7e6f4016c833143c3bf7 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 a5867cd70a9aa8a3ef33226b845415a1584fce0e..6ecb45feb814b3132b102b13c2901c2e76c99edf 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 18a9cdab677664c022a5c16bb54e73e3a82fc4ec..dee2bffc0ca5d9904d58bcea8c27b134f992f408 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 4f8ff5849fb6a233bda75dfbe731abc07d71eb73..800ce32c47f99883c525d8566788311fc525510a 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 16568484f0b06ecaf6368cec96680b9b239723ec..f82d32cdaab206a25c5914c3de29daaf9ab9a828 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 c489f2182c924813b11cc7f57c045af3af18e410..6a74e8d4db0781bd8881261e00079af00a7a7a48 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 5be7c7c8855e5c0299bae2f0af8d51f37198666a..3ab744afd3945e011baffb8e529c473d73ea285e 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 6781b25ed858ea95a736776f7477c99211d0fc32..88664512191a0b46b958453e95033044860cdf48 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 84579e2f49f848e0ce7884cc18c81dc8c7a53947..b1804dc70b484207480c50a16a33bb6353b9f206 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 4c5a16c803e92b2de4a37286e7d786f0014ce057..cf20d38836485ef019af70537d5f4cbef1237f69 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 9c48a2059a956de78493b9f7bb76d508d1a93cc5..ea746def10738915470b51fc6c0de6345a245615 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 f62159c1566affa06ef6316320cc322438008e69..7b74fdbeaf5a680f17a53ad3927e2df5b86a2234 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 2a9f8e1464c759cf5ea9a17bd3d9ef2f2ead59d6..8a5b992773ff0d74f49ccc167019342e2af9f42a 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 1dbe43d76237611df1894ae45d92454bdcc171e4..89eb1e64929e5fc8aab90596bb40cd8f82b637bb 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 ed5e23a9d98201a8a10cfd2f3c5a21fcea2ca38d..1b60a529e12ae30685e1de70db27371f5ee7f138 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 e9719959a96082e4cc065650b62e7c8d8a9682eb..16f23c5048570f64b76befeed5767759ce6e9424 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 1a1960a0d24b1f7f7c1a3cfad878a7b3d4760531..215a837e4595f0222756f3d43e3ed34b86e3820a 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 e277a69d2ab1427e2e7eb1130c1b49d48ecad8f1..ca991936890aea17b91ac2410f2b39f40f823630 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 7d399bb399685b645026b234dc3eab0f81b934cb..bc0a882e2c4357fa228b26eba01a04aae6b94a5e 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 7adb9cc1d508fde1cfaeb49acea9e8468253e2bd..ce2a6655cde09e26c4e5132b44b9703a4319bc06 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 37e776417d66ef0a5a517f0e03647ee0de8fb80c..c54c4bd5b692717f0d2b542dd7ea4de10a90bd94 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 6c417c9856bfb0f20d590a416c662c3866b18683..1f110120770324c937d2b4cf34f48d03ea6804ad 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 f0d4890eec105cbfd339f9057bdecabe2e90a66d..97d2de76cae96b7dc21815b2815ab3156796d6cc 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 11513057f8552afa7ba1769050632384f9c9a97d..60176c905b73d03203bd2e4cf9a7b6fffcc2a63e 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 802ff5915b9dabd8dd8aff1b6bbdf463d9536172..5f34604f72d61f4c95c79e496dfc6fe623bf1bf7 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 0a9deac046188988c1894619785a9e05b34766c4..2189ee2ebfcdfd29756829acc86a6839ac73755e 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 a5ce946ad7619c828c6a1b03372cb80a0ea53480..101607188b68a939857a4e1b048ba1731a3d09da 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 7a4a6262adb7074df760a8c298b1a995e2ede872..df571f322afbcc3238bbbce25b42f53449e94086 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 d31cbd08ca0dd0c3af697fa6b0161f3c773f98ec..82c8b86c0a662e2cc2c837424b305abf33bc8d61 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 07b3a1fc08d6236bc2746cfa5d1acd3acc7c9da4..9cf8c1ee699245a2a3b02d6d77d77e6c0df2e4ee 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 c3f185487763c96e135ea46e0973fb8b72368577..00e1ff529f08231ec9035ffed6a49153f7aa1bd0 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 1edd9ec625eb00c54311b8ee3b2f9258823860ac..5a83e7bdbdd9933aa208937932413f30a9434cce 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 e57c9fd05e36de84d14e64b3060afa12f053c940..7a8b1a8b58f72737181e6b563256ed64dd396fbb 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 284eef1c4cf5f63306a0c7b005a6f157bf53e640..fccdcbc179c047289df09006f3d50019746b3797 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 f9444cbdbeb4d5f865aaddaab075976acf9617fe..383a96f64445acf854e5d4b5ab4237665052cc3c 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 2eaef4047318b967f3737249734b167e310d3525..3e58869dd115d7f849b92e6115b3ca75a03b8b81 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 0c7ace6f01af69a29be0b024b03a24d9839b248c..737163cc467afa85b8d82cbc15296e58d040bb91 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 70888d40a3e64c42b245c8ccb071da297372bd53..36255cb24e2515b72b678a4fc4ed685e09d8fd91 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 62713692ef25be81445ca2b4e567bd312754f0ab..846db5a8e8cb03223cf8812642a952866682f0d7 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 dbb1642ec2cd07e96137ca1603eea49c1041fcba..90a27bd91e9c1c949f25155571bb412322068951 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 1359e81689154321f7f29ef563a84bd4091a85b0..fbfa7c5b16e25390e1e9f85b391bc6044dfd8d72 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 97db93590ef907e241f0f667dd393a6cf626b267..de3062628597b1f5f47c0c813abc76d73e742fba 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 66134476b765b85c0971426242dcb7388c4a2ba8..16c569baf46420a162227c9890fc6c50fbbdfe87 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 079f197c1ff76b0b08905966aaacfc7a930396da..fa2cc94cab5b84952730caf9aa00a50840c72cc2 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 eff9a8035361f392e30f98023752ecbfaf3bff30..e1a9c2783daf65d544e16fc13b953349beb0bf18 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 6edc370a2365da71288ef0a95dd866606deb8c77..0d53e8c3f6df639c28569de2b2b0f26b51fea7f4 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 5fe8fa019da0a094014cce6a972f6a20985999fa..ba5526141ba2146a5fa613410781f7dace06e228 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 fdac7f8dd688c6062131c1f8a23611167aa8fda0..564d647ad2cabc812791d4c932e00f1182a07c84 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 5cb07a6939e249515f78950b3b22d223a035fb5f..59db81ec1621815e62e945564ee72506451486c9 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 5107c789003c3a8d1a64065f608ce865d0a491bf..e59ba51693724d16a4acf17052ab72eb8f3fe870 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 b903233d87e0dc504b18b98ddb5353297c9fa186..bb35e16b4d549df34c0d1fd7bd75afea722d8697 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 4114e983a5f46820ed6e6feb2cce4ddc42f977a8..fe53243641085a1c9b4b769ff79fbadf0e9312e4 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 ed1d224c7b3782b29075524950d9170c3b2116e9..186f0f8f386b05cb367a0176f062b10f7c2434a1 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 da3d0a389c395d0b3e80799124d3c564a1ecc2fa..eafb33b6d416bda821e8f413a4cc76ee6164f0e8 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 5b957dcf473c2ea44bb684cddcd49d57085feda2..ed8a1b2c7adc620582f641002bee18000a57258e 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 d497e5e5d923f2bcee9d74a4c7951b4a2c6b3fa5..ae2c63ff12f24d58c4936606b1d17a8f4e2f9f74 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 d59ffbea7d04c5f36205bcde41e959ff2b9594df..b903cb81a138d616f7eb4f10ff1c4909b1e30681 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 e90f9b018b5687ed7e4410ffb4577487fd7990c2..cdab603a5fc4b15019db242db94260b0a47a66dd 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 deb88a03393e7ba8197e018e9917925a2db70b65..e0a0638c70e9e1bc283b4716a9eac48278a1aee2 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 8ba7f81ecddc01616585b7323c4012f6e79a5a0a..3e2fa4dbe94bef4225a28494447d642fc8ef85fb 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 28986df04dd6477098057794f4e9304c6f9e7f54..963a85ff7cf26834a2975930f57c32f122f6b9f3 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 d1911fb96169e96763d695db6f12f2c59967fdda..36cbe8397030d2bd9a4a7ab0ae40cb8e01e6a23f 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 e4392c1c937a1160b6b66d9d88dec59e1dd142d1..9c0a052e5cba5b635108293530f631a9f5360459 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 ea79c4b20ef7882b55409d5927e61fc033c5be34..0f59eccba3cb37d0a73a7be3bec1ba04f92555f3 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 25e91c17f2e5a7d37f78e36f6d6bca3ac26db875..586054fd48067ff4fe62169e9a0a8692934e5f0b 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 f03ebd1f09401651ca498fc0cbcd6d27036389c1..7c9ef99b001af91520298cd7f991873009406bc4 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 7c6480505cf7bcb4acad31d580d6b07de52342c8..ad6eefc52a6483efac7df9720110e0e0f170f91a 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 28207c49ef07c86c7e911818f15eafb289882b0c..6e2a0fa3d78dd3e1bf9cd7640ef86a62c6abe225 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 572454b95ab31ed8dc37471e186aad2f68057672..cf8c9003bd1bef49e0f4b2d3fbc90985398d17e1 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 423049ad667845e375f90929f818c39365290a71..7b0cb5f914f52750a3b1470a3526e58ad41a5b68 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 eaf3e24cc9eacc51e6ce2854a4181f5c98519e43..be4d9acb2df316a5d02e9ee7c0d8421c6f588e7d 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 19aa4eb5a9c2f3b2a1ed11f07d1b7d84da9fd4b1..a1927221239012eab15d7bc3d14d5401bf7dc843 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 015ace6b4deb4639c69be3011dd566a7a3b27208..cd67ae6ac2f9a0a5a32c57a290764ef4a096f8dc 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 b185f2467c6f311dcaf23dc88ecac80a30ddb83c..99f4422eca2dc4fd63202caa74cc786a3344d65d 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 2b5dfa6aecb52c145a25ada30042d29a133a51ae..b1c743c446efb91c29f06242a05feda5ce4b94e9 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 8e3c3fb222ead737a9fa3b118d5a246c83908cd9..d220304539f124e95050b5723de78ab557c59b30 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 1e750e8e6fdd3a8bc86403bbf72cea595f65e550..28941b695d860ab6f46e617a8140564d2a754bd6 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 500557d15dceb0a321369222bebe7f7b36b240bb..6473aa8b65824d11cab3194df9e2d4b68986f234 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 783df86163dd1fb2cec85fb81a3248f1e8075d4a..daf26ed5c2a515f01df0a8646f50493a06ca0bf9 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 2dcb86c62c53211462d2a9830b1843c1f210c211..111900225ecf5988974cd7a551a2c6da6836ee1d 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 454af5b842f12eb35656f3b7b148a95d0a3707ba..2b6387edeea0fa8fea7c87496e54e204a6b27adc 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 918de86f7d639f078516c4e73580925d833d3532..f2cbb2ab615a902d4e36323b82635da75ce62bcd 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 52c049f984c70750b19bfe6c8b70e7f90f4909b7..2cf79f11f96544ee1a06c588ec5c2025f69fbea8 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 95080731f66cf657dffe04c88c6df5cc640dc6af..0e28f5a84d5a2464dff03d9fd86bae2959a6609c 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 00bf8e7e7c26f0c70884ff6713e880aa948b1619..683294364a308256eb09669e92fb7f057d5eff86 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 d5c79ef522b8d1bbecb7f0b81a2479e05a19b92c..6e8d287652cdc81af4ce28edb5f8359f65d6b9a0 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 ac65d4c0257020aec86199c36776a94a0cb7e861..87448694e1165d7db2d5e4b7de2b4ab94fc8d0a2 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 5e7cc58e65bba0a44faeb842c1f3c9229693ce5c..a7130f7e62970b8608d4a47a29985eeda255e9e5 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 2e08636ce6bfee2367f2ae9bb8fbc5facd34cd74..8f7b8145f43139e1dff8a6c276a3801ec04471b7 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 73f0d2fcf3e4d6a0f56fb58b7296ab9ef89c26d7..2e9d8ebe10c081b9eb516ab97897f8b23190424a 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 0b141fe6c8831983c9472acddac6202b59cbc0fb..f7299b1c66d7058c30e52c9f9ba7104d0e42bc5c 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 2655f043be2541a2248179c15a836228b2021289..85d58d5564f7e5bbd97f5ac0122ff12b91de6c8f 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 b6ec91adbca271103b80397d1561b5b2c8ff7ba1..0061bd3fca8bf0674fab7a9a0b0eae146d1a1c37 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 d6d492cda59e10f5fc30e39e84d7388683c15e45..db51c2dba8a0fc560026c8dc1368e09b83916fb2 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 e18cd49cc8c2c05c78c14523cbe464c7cd135f66..df2d6ced1d36478640d88f3bbcfb660bff0b3eb8 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 7490f982d79e7416af4cc914f083f076fb4230bf..c5e816c47afd7fd83e7bee6f2a9e177e0b364aab 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 a07182756d1712d4570e1f3b19093d4b4bea6948..e84f13aec01bb26117321eac2338c887f4b95de5 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 0fcfc13a51b96523e00f26f69e3326e0493c5014..0fd667d8dbf93180d27111a67e178f3ad83bb89a 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 13098391893dfefa202317360fed85a71e041d80..678c3c0d85f70ee50ce4f2297c3abaf5c7dcbc33 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 eac5f7d914713cd4e165c0be42bba54e8c22eb8a..a3c40e589ad3e9243c152c2667c26fd52a79a53b 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 49cac845237ad57fa1263e36259763782767a5b4..fa65507488ef66c5625d69cd03bcdc05c0c6aa49 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 398416010b1bc415829332db118b5c4af4f0db2c..3b957acc52aa7367f39ba1cf19eb6720d23ee2a9 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 69fe2590a06cd853191b3f1e9baf02a44267edda..b3e135191d7abb8f8e0c64531f1c1fc5aed7bb5f 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 fed3d18a034b2e8af045d2b50b9b8c70d585f0ee..b9eb07b695e0495a6e3feb67a703f21722ca4c31 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 d0f9abadd0d90bb5e432d77fca016affcf84c791..e7a9ae6755a24b0d063d88a981a70fb425d81f25 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 eeceb9e5829b4f85c83a97333b3f5740adf80acc..77e8550bc19469c80da567c3ddbb4404bc449687 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 4625d2eb5700e6143256e0db73169284befde1c9..a9b333f3f9100dd78ad9aaf62fbb95b5973d8e4b 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 cb6238c254ebb4810a7d12249bbc3a1bdce11f60..c02658bcd5d6c55eba3a8e97eaba91accd25fbd5 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 e64e86fce001bedb0929b908cdaae97d2226fb32..18023c6270e47d6ead4c606a9a188a2d91f19d6f 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 ab5c5da665c5256ccc337a1d131cf714619ba116..ece521d8f1e3bf72a20e633d30f4ff17950aeb44 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 dc0a04bc13f4195efbb637cfb5976cc339018054..5a7eb1de7f3cc1d949a399a94133cb7919942a95 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 4a702c2638925d23ca1fd004aa1ed9ffaa85818c..f2ee7176d45beef6649cead34d319cac61ab83d4 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 ef7487caa43a5cbf97c17f0949e4fb84b6bdc90b..2a4dfbbd380f361b717516ecbbf2dfd2abd54b26 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 fb57aee02231387d9618418cba63d49b0c91c4f6..b6a7427380b5feffb19277fdf733f29ea9b5d031 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 7c27c53144750e63841457d07f37ae449d227400..b645c7f6b249a655d5d9c5555c0eb59bb9f7e4b3 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 4cbbb539541049de8e7cce19a0f8ffde36f136c5..ee52a97f0cb4e0faa74b0bbe01c2b58baee6c1a3 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 05e99cc696bd39d59867ae0588c71cd44e19da10..2ea0ad42a24c7ad10d69ca97da74f776cbe906c6 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 afb737eae7ead6fe5cb243ba0834b0770ef76675..0b785d75fe0b798cf287624b57047ab344238178 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 9817d76c336098a394c44e6738e039553bffdc78..c8afc9304ef49a4b2c71607a4a95937e2f0b5d16 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 a196c48e61b085ce3bbe8160746b2c110f52cc70..b58e46b853664b706c914c5d1066b9f57391c4e1 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 75f62c931a18c6c452b1dcf3ec5f357de356ea13..02d4b03cfecdd0cb8331b4f57547ae64b92794ea 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 8a74fa0880965abfc432a2d01dac6bfbd3854f65..d28347c72334880ef8402d92a37d72b8a50dcf7f 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 b0e65a378bb1fdbc9f5edc18a32fd68e3d9ca3da..f0667b4bba1259b70e1e574c583bdaa4c030d2bd 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 5f7f9ab01a813fd62313c083f8cbf2ab11ed57a8..ec26a6cdf4f4c93104fb9e7e46d888818cd1a232 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 5fdba6c38ba82661b59bd1022b4fd7775333c475..4e6db0acdc8bf50d63089e93b54decc23aefa648 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 1fa5f238cc58c9973070811a4597fd894a9c98ac..01389b37f1830d8963a41a2b6d6e972148a5529e 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 8f8f9b00890df4aa349c3ee455780c8c45003155..75b8a40e0c07705a5e421a65b36cb551f36c9708 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 580c2a8070cc4825b1bb7877a000326312ff2810..5a285c01f405190efdb3579e5ce5f6b0fd025414 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 06d4853c876c97b2ee000e23ea3239e24d6563e2..c0336cef05807b62eaafdfd44b6d1b9f728b9d65 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 768a3a93a25bf97d0a2c550b2b4b9b11f5ab1c0d..dc942bbace3dd0fe7cf99f65730beafe4c797b38 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 ec991e0d062155ec52560cf5d8c6f8c174439787..0169459cddcab24649cbab3541c2ceec10dc1fff 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 8e11dd114964684140e3f356172abc76782ffdcc..27072548b5da9be671b8e344b06e2ba54be87927 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 0c6a35d4b18d9be1bb2b1473e3027bfcf1fadc8f..ae6ecb1dd0aa9be5724a62fbc8dba33edb48cda1 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 e6571b000645a352518ff0f5299aeec17a976dd8..817e6058e9124be23d6241421210e27bee5be835 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 349ccfa9a24c32eee75927a4c6fbe2c72a6b4297..e28d053af7b8fbb1104fba72a3c0fb50b2bcc5af 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 b0ce4f15aec875965c8c6adff320d3c24f4dfc76..af938ae1573982faa6570526a8ec9a39819eec71 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 98adf18b7ad0532dd8524b1e9827318a01a5b28d..b56afeccb760757c9ea40e17c1ae136a5903f98d 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 a20451c13e5bc4b20ec05c9ec41d3c66cd8972f7..b1b7522eb8137617e70404bcf261e688f026f6bf 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 459684da72769ba89edf21f44f9c99fa2b3d55ce..94145b180122f80a184b98c90ac8f456e232cfeb 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 60362da51c8427f095a91fcb9ef3483ed39ebd34..21ad19c2c772811493419ce8c3cb69589ce56725 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 49ff6f58847b9eb141b2939f815615711878f3d6..c6f6eabb0651dac34c0f0e12b222e6389cecf179 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 a474a899de93b66d1e351fc0c53528d38c57db06..9bd4938333009ed8d1026d5532c7d539e35a05a3 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 8a21afa3962131b7044697eec675d138ac914d9b..72e8dc7870d7a0b46175a1f3c569720b228101c9 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 dbc54f547cc9512547fd7ff6045b974f183383e3..5a5164cfe3bee6373f9c7bf126dc6ec9cb4656d7 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 309a7fb546ef51f434425acf3edf253077466447..11aad5b137d4e9bb4d9fc1cb76d7920aaef4bdad 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 f0bd831137d2c3d9edb3f8f0cc8f7535fc4cc0f7..7b4d7a60347e5186cc9e051796081f71d65d1211 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 8c4800d5fe02d6e09a82bcd3cd5cc7da1021a5ea..98e994d17fd272f5d7303443ae192ef1141d8fb8 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 345b5f56951a670d5d67b595ecb35e57f6b7f726..96a50c369d19a4acb7e5784fbc9c5974aa8d58e7 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 6350e0bda7a922405d0f5c3950ab48073519960f..8bcaea643ce4b4d9bc222a5ce3ed7c7516e6a32e 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 004f0deae49612d973490b6f9aa9ae91387f2047..ce5b06a92d2fd0e3f2445ed94802de48b3eace25 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 7019ddbc5a52e245ed3a5cedeb0d4f3336b2cf91..21c4215631828fd2a4b8a39a7cd791ba27d4c020 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 9fa03989f612e8b95ee16a21a55dfe29316c2eaa..4f427d69a988cfc04e7a04825c34b021271c2f06 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 43954bd63a2677be2bec16ba45b3907610d024b4..dd074db27abd7bafcc2596d4f69cdc142c41ea2e 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 ccc75a7971a9cd573b6edfb3fd4f2957a1e133fe..5ff237058be23f5c3e8241d2f6fc39528b98c47a 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 1471208a59be0c6bb66643718d5ae96c20985020..2b52f72142027ce65a92f41e2e454d004a59b6e6 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 bcd67e555bdfd726c035cb04e13272c0ed111e5e..082ff094b0a74ac2aeb670ef8dbf83bf0701c49e 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 18b2e19e1a9d0a2d85c2b1e3f2cb55695c56cbb8..89f6fb7b878428330fb57ff0c305a35a6816adf0 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 cf22b4477dac7845cb14829cd67bf5770262cab9..98e61cb57890d847679947a331eefa6c50f8d50d 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 af63097723b7c69fb989d615adad77a05e870449..8bc9ac8b82d63b4f1a42728e670e9ff4a0ae53d2 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 7e54bf71fabb342720f530d35ac32d303c6dcfcd..56629e26899682b140392efd0c7a2a5fbca12569 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 53a12f0a02cbe9d70f7f1e8f10e0a38a6c80ddfc..0c7e2cac61936be42924deb3554481468495d19a 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 5e1ef3fee1192fa6cd6ae319a92b25903226b9b0..8852ead7b8e9dad1b9ead464316348cf22197898 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 c10782fbe6b9b39ac51abf75aa7cb2355607b60c..a9e26152edf11c1f20de0041caf2a42d151990ac 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 225cf13d7a39d374c7af4057fec0a967faadaae3..ecc2d4a2e117e66828d98a4653847ea2db12d43b 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 b0fa6b430a7297a135db07a65fd2bbb649967ba1..67582d5c2d0ed2f7813c81be55eb046f4429e71c 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 27c313038ab92ea52347307558ab3903f48ab78d..c2ddfc44c97c71f177924cfe04d9a49dd79187cd 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 a21fa91d12408e2210b326e3c94494a6c8c08179..ef70eb100f09770762809c6e2f89cfaff49d4ff6 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 1541fecd465f5e33e7af66bf268d7591d6285d85..3d45b8fdacd396180696190eacd030910a989d75 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 172adde32fe25689c59ab5a16785a3661a08ecc6..ef35b1165649eb9fdbdba0c691fd7ace75d82352 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 78e4cd009abd5fb5df503e95184d5822ceed840f..c369db5fc543d51628028dfc503735586b46d576 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 ef4858171dce2d95ee179c57c91b078b29fb57bd..d5435539f76e270a27c4a8b5249faf02b4ba2437 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 fe56f46d44a57e66e237f4fb793660f45ce56239..2d8056e1265c9c0e348e502dd8f855ba290368e8 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 78f1e1c88f4a62a007a3e36198dbfbb962e82af7..ec3a1512e1b34aa468841ab2e5ba8d34dd0eab68 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 1025500987fb7843f02df1ab81646fcb1ab6be2a..ad62e935f1587fb68896e255abfc9e149d16d322 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 ef5d6aed71535d8e4fce77d12ef78b367bfc4e0b..076cc43c8bfc12873ace4288cf5f10d6f3a4b349 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 cc45f4b29e7112d10e20a4674a2bdd0adc1e6070..630ba72259ee16588e0f80514825181e6e7b5aae 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 b513c9f8ac826625013398fe26f366dc9db8dc91..93619f2d93c7626d2ecf0ec882aaa38ea55d115d 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 ab48720c213bcc43fbc958829aafb32cac1d6ce6..48dbdf5cb0bb6e6a53cdf8ab309a7c4ba9920e9f 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 7a4f3fdc243bc4fc2d43ea1409d69f7d562c821b..54bc3c827e3f2b98ac3feee17ae9cb9bef6e1b68 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 0a07ebaa667d59748937b84c129afba5c94a924a..16119057903e8d365e2361189691b30610177f43 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 be19863b1ba80c98ac7d73ba16e65c006d3728a6..3e9831562e2b3bd2f6cff5e5e589de2ad47b059b 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 34873c1a81fa202cf6cc97d947ce0a30dcade64d..35fc5cf5a32914d256aac470531830a0890e7afb 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 cd1ef92c4fc0f17d5bfeda324d15b09e03e6aad5..ba47097fa84ff3ca2f43f93cf7a3c4ee94b0cd30 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 523971c748e0f55e90706dd5d35ff57399055656..56c2fe89fdced4aaa5508468c89a3c3c0ca6a970 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 b14b8a94a6e9530f2d1ff5c753a79a59dfd9ae98..12413070df42feed1d31653226795dc9d3e414d3 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 0ebc118ebb8580112f5b20a9fd4495029c3be806..ddcd4f5163c2f5b46b38028b390fb69adf394aec 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 150bbcdde99b7430173b233f859de51d5df52a4f..fe436402b3a8b984eae95241a50bae936d6d4678 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 3280236af14fae96626768e7d8ddf910088b7214..ea39e99e53821c8a00f85eb493a753601afdfcb0 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 b33129a9241bd219a1e01e0dfe0c4faf9da50ba8..2c35dab48ddcbeb471c9bc252f6868764e839225 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 86b2c65a1582dceb38f20eb4e018da09a9e66105..bfbb0ac59ea97b42698b2ed83c3d234289bf02ce 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 28527515759d6fdbf767c8cbc0ad35aa547ccd4b..bfdf3caadc5b673291c4cb42662b7933ad12446b 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 5898887ca1c9ca3e065b5ff856035c931c6e770a..f152e45dd1fbce2501099ec6eb14839f2a296f4f 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 a1f17d737455d87cfabdc39c70da2472f8c27e71..6e083703c6c12ce90bc2da548daa32576f3972b7 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 501db4028233a76b0d6b481ed8487c3585e0f1a6..fd23f7647b29a1ba388f9500663b15e3aa915274 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 1be0e294ac610fe4a4c01930e81c0a510402c016..1bfba3177e640eed21264f2bc22cea7d40a9a429 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 19e419a5de3392a5b49a2a75a2ac8a4a988050f8..6a5aa49e91897e88c3f919c9199bc2e527b8d3d9 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 a461d2c0806e5e51c0076abe24af6080b0020f42..64db270426073b5d9cc822f8fd6606586ea312fe 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 91686d32d69394fc3f03e2ecd8f433cec75937e4..e48c6e71e22955e41c6c727038dcd3266166394c 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 da4b7685cda591a3309384587814d035a34f7be9..045bed977f230381f17af6fcb8bee4b9446dc12e 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 c4d29681a24e7b23c1b836144c10516a700c22d8..5c94d0b04dcc9c4ca8d41b7f3a8634461d73646e 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 04f5b9b23d42b1ed9d6ded920d8baccf6c8b3972..44520da22c182b4fc43985057b5ee6ca4fa316d5 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 5dc9b49c19c5751eac993ad1e9d987d53fdff60f..f3aae2433df76c67d5bdabd143c2ecac2f61a7be 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 c87992052e182773cc2b4b9279ab46e79cd61682..671a3e7ab9617e3941df6f9e5d1bdef534891c8b 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 cf3b3096a3c4912168403753f781a27f01aafdb1..1936a6c4d6297d943f35b50dfb9a895f4a07927d 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 e7ec53d2b083c3b0f5822d7a6876e51c31609d5f..2e707a816cd16cffc3d50e0d68265952065eb209 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 9bf56fd1e9c8b9b447effc815f627b81da18058b..e2eee9f01bbf3ffcb2d779a724cfddf01a1fb1cd 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 81627f0608d2807fb522306b35641d34e70b091e..0b61897381a0376d05faba6e445f75da1e483a5e 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 5647270e548fc3d4e6a676391078e5dae88c384d..a40a01ebe7936b1cd19981be745c9a28be36188a 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 b542c0a8e87488d3b5cf20f3f76b120003c934ff..3b522d38a4019ad54d5c8435b803f6717feb9f9b 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 4762e69f8a9df5b9fbfb31c7903a58ef15bb061b..7f8d2935076f368b2a862b8495c5a0ad4b320e2a 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 d25516008ddbbd6ac914d642b5d99769bc3a8766..23f7748fc30321218d8e92ffdfc950cf2017e84d 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 95b60581f0a54f3371b011235b4ca01e6646949a..66a992e52672e922579cd4577ff33322d4216612 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 c06c9f225e1240f8c75fcb1bc2d9ad03b9f010b9..e8ce5276a17f5ee9fa08c0f5577cb69cc5b49d48 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 3d5822b5bb400855121ae92b96bca7c037e44e74..680e4cde164bd382c303b5409d3b3eaa5dd8d348 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 b9d732bee61b3629679a46732d9ed1576ac847e8..59f3199c2d3d4986c00bb7a2320d541a8cd97636 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 07fedac83df64b15b8f7d5748a52682d91df8b16..bd3c0e44f04fb4e76b8291395ba1c08f370a3231 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 62bf138e9f937cd26145b14173073e1509a245bf..ca468809d862ae1539e68c1e67db0e7a83e85f28 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 1659df1869c18d99926db482a753d85fd4c757a1..adf3d16236e61f2889cc970c49716381cc114c6d 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 dbe99b943af2324012a0fa6f440b89db7f5a0069..dcbace13eb0662bd82b722c43682104c6b2f830a 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 c41048862df4f5ba5f75cf0bdab4dd016bc73785..86326db1887010a1d1f6fd37541d5fa555198eca 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 ed3ebf426853370fd6e655f004532c641b12bb6a..37e5b8b2148d5039f2771d24b163009a27ca62eb 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 877c89ce6b539d3445d15bd8ddeede05c753ed42..b6693cb0a55b34bb2fd3b34e55f6067c2b5823eb 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 6404bf48ac2ff8471d45e7208588a9b6fb67ff26..54f17b696f726fb552cf3ca5c1963e94231de9a5 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 ae0007c247f11573779af67c8e6320743af3122d..a89340d37e3a333453e0456a02c12af4f7051abf 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 3be9d5393afbb5ef9be9cc4365cbeb7acce955ad..3ff6b5a5f133a6340d59ee626ec5a24d768cd4d3 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 7e963577a31770597a6eab996893dbac4fb17957..ae7f72480ce16b711e32f5c6ea896fa840d28de5 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 8c2181f2d041d7736dc633ba1b57054d2802f0d4..6a0e5f42085595516ef1073660d7655a9294be93 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 e5aaad311e9e5da29fd55de07881590e843f74f3..5441adaaae5691edb3c89d6de554de9e3fd1d5cd 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 3b6af8062667e92a78e1781f32ed2d15cc8587da..ab1e974bbbad574d84f13435297e5245a8455876 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 37ce41af392a8f3ea2380655c47a07fc92784fc8..35e10832afd669285654effe098639098997a76c 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 e138ea97330b25bc6605dea38cc94f0b78f0b9fa..e2799f6261c8d6ac29fa2ad827d5eabf98c32195 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 7be045b90e932b06811927200319b91536aebd9c..bec2f7642a1ca7de907f93f26186227b9d7e8329 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 9871e879c5074d362bf71a2e5c8270e93e5e9929..f903639f6646466b126b8cc99023cb0cf60df85d 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 043caee8a6f9bb6997b1c82de069952ef1cca17f..9a3be6a61f49f1c737971f4234e82cde040a45be 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 5a02507313f861af57bba899afb7a209024e19ba..469d4bfde273091244fcfdae98c0fce391812a1c 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 1a082e52837507a3ff44769bdad912a3b95a02e5..326a2ed5f9b44595202790c97d07eb124ae89582 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 3ffb75b01dfa572c01e9e8f427bf39afc41ee718..f23b5ac16f7e5935aaba35864e01d6359c8064c3 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 a0751773d7a77e1fe65b3263289b523e66f78ec1..a88d038055191150c53233d022f93f447e3fa35a 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 3bdbf854104d67e357629f369e6c743fcfa2bbf0..185ff30adc596b30dd2e0f9f97ca8ee191133f4e 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 157b62dfc9172ff8c5d3aa5c06b88a0358a236b2..bab68706d18758214e13c9d049e76b237a94bb9b 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 aa71ebd5ffcd522a41a8d0573c841459a05c48af..3c4fe0813391ab7e3e88adef977ecb6a6fbfdf32 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 1541cf2749c02b2f25ca2f23fd3e5d69554b9ddd..3e6eae0f58e693aee217d66127bcb7223abf3d54 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 4b4ac832090486573d9c9a3f17f1754dc653afa1..b3decfd8a3fc05441b69afbf8b70df9ea8d9cfdc 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 2344ede712483aa89ecbf8d4bcee884eb18d2c92..a3cc473ba97325c4fec07b339ce613bce93996a2 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 fa4935f7d49523d81a0492e227461487d9263128..0be90029c6e2045f107608fb3ef949c830741609 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 94b993ccd7dda7dfd09cfe90fd5ac15e3a3e7f52..fd795398c31e201c23b251671714041ba3aef6bd 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 a466740b236be2a87c8ebcb8d53d0e5d562e0f8a..675d36fd4a40af039d7ddbdb686218af3e2b8a1a 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 80d175ed309bcd2d49a5b6204067935a3ae71fa7..b2810cdc56df1794d998ada68c4b57666f8a8dee 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 d95589cdae20dcf74046b9524390b4d88aae4597..789059504dc9607e9b9d0fd149ce95badda664d1 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 709b701553de3b9abb3469aa3818e3cf7c472944..e955a4618ba75c8f2ad126d2ad757668cfd64b15 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 a93a69705688d13dad54891703593a0dc0b94817..edbaf190aa099fa2b4cb1467e987429d291afe35 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 0ace9ea3131cb06cecbe1d872fd5ba2d7d3fd7ab..08b7e6f3cf9d5182ed6821bda1b5e33f18813f48 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 7d2e102f318bd1fb8500cde56716ce26880c29b2..485e73fbeb4f88f6dac0ef8426c77c287e471bcc 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 b9ff53d78c9d5d83bb4f89ff0283b2555e602cba..2ac74dceb851c4a74a36ae4638d8465385408c42 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 24d2e6980d9fdca1a36754706195d8a5cce2c825..78369a793b73eb9802145887493d81e635117c18 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 da563c8ac6022c5e8fe0c91eb1f09547fb3db4b8..59df6c9dad93d1aebf8525aa320b3b8c4df65630 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 0c12e242265a49dd5e69e5ca4f99726610916467..9a2d21d839d5b059c2399ca0cd7b59c744054383 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 c958c8025df9487c2208769fe68edb159f01010a..736922d968e1f73fd40870b265deb5718b64cb0d 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 9e424b5aa2678daae1a38362ba7a09cf85908b9e..0c5f8523761a3aac784472bbc579c5250f877da2 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 95b1a85538c248d45a3752ac73e5c7aab9317540..8debf1021128cb5c8a0b573dd74257cf7ca9d0c3 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 fe72836770b97675d5580cd7d3ee4d77d83f9c1b..51fe48974da091cc2a0f0e01e1bc7b361f11332d 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 445ef5f560a3933c8b8edc224588a20291e66fc3..4ef4e170e11d035eea43e650e3e21cde03b0d68c 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 5351cb090e6f289359fd76afef25157dff7c7448..f71b7c90b80c15bd6b8f32d8f3330e838cabad3e 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 19b0c24501626b73bff76859d4850928a9dea0d4..f2d49f041079617ce5b88222d4778e8aaf818ab8 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 cf68eaf776e859d921d877d145f270d0743231ba..87a98f778db306b782b3558fd547fdfab79764e4 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 45f3705a283df1754abe6667f0c46c92d84a33b0..6fa349e0f9ce0fe5e46f51172b12e1539eac5778 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 ba9bec63eaf346d9b33d45aa4b5be23512043821..219b1ec79ca88e3ab6213770fb7b1564abefe02e 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 92e11a297c2d015da1dd83990f791f8e2056c806..2f8cdaa73ebbd2364300a8e53fa5267f3dd56bcb 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 7b4fdba4ce6c1febcc63bdffe2a3002890ed4246..3581193f6773535de0ae7c6ea634efc77f6f5b68 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 935de174ed2c06691c8daad7cc9de40da9bccff3..0afd087dee3fd0f9e3ef78fdd6fbf52b5816894e 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 45ca67107a03867c807d68d7fe7dafb20b951084..fe6fd0c27606b9ebd2c79d3d346ec07938ed795d 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 ba4fa478b27e7527c07fe4fe3e60ef7bdbe25aa3..deca7e4455006a15b835a5c2d70ec421f34daac3 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 4b47a0462881483b199f56acddee5278ff28adec..1d66c269d354f79e04c32efcfffe49998a3b68f1 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 18843cb6f7eb23a99ced3e91e5c34721e44a3e56..faa7324cde184a8b96205e343ee58549fc167721 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 b07c48b2904e43e3acbd37d2970c265295060054..ad562f128dc9da0f041a0e6b8a2564c33eed4d82 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 4170926bb6843c723d98814b924e370b3f39c523..f01b5a148b3a0b68a02b3200242d93bf0860f9d8 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 d1315b1288860c39a11c4447408a41b1bc589eec..6a1f01d16edcf0543e39492e79209012df11e9c7 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 ea404b7e0397b96da280274ced858c914287bd68..a36f32911bdf97266c4bafa699841556e58d79b5 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 851d380fb6c864401df7f47fe140c38b9137b4eb..55587a599e2356cadfdf7c1dac0799f76b422305 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 49046be94b0287fdd33edfa2a44f2398cb98f71b..6ca0ade436ee71ca49c1ebc6a1b0be2e28af1f4a 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 6ed0096b7b6d475e3cdfc4b4f0f8d706adb4fe4f..8526e92f290e6f11fc64d7f1275cc7134ee1a50a 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 56b66f23a9f23ec0a45e818b111ecf2aee2a4016..eb4cb41fd9dea611951e8317a7ed3681ede6e76d 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 07cf7a7514770c13a1368a5a3d1222a42893fb57..540bf698f72563f8ec8356a81e3971a788a9c030 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 677706e1856160cc8bf52afdce10e8ac3a8f281f..32f47880d5711de43353cd8af2a17ce842ed74a1 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 263431b064a07c67f670a450fdcde400e5939cca..93c8c613ca7c5c152010760aa571cc4adead84a0 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 374d86614ed0c8eda9022988ce279b14c118c1fd..04f69320acf294e50ce2c04c0a51beaf0209131e 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 19fee248ff9664456980ec337dac47f954c7374b..ff3f7723f37c0fd75099ea743c9056b70965db2e 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 4c6f2d22e2862c0762a59ce2910a5529bea121a6..737831e9a4cd6774edd297019e9ead326b4e55fd 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 19d36703ecdf33e0c4c2bad346934ea0b2cda616..d62d680df558a7cc8d1c1881a17606ce951bfb69 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 5100a3b9a50684729b742ef8b5cf7543f5234311..a704c4249610a2473fd4786d4b176118cc61aee5 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 3bad1b265da18ae95dfef03b56d34556d2d413e4..ca51f5e92eb1cb87e41d98dba6f208f995a692b8 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 20f217d084957fb9e6277e2b665a125f6220beaa..b1f3e68028c776d769d85fd95d0b78baa0e35307 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 ac3afe48a29af316f4ed88a03375ceee7d36f218..78599edb2ba054ee8f476a1f2f37f9743572cead 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 fef16c05357642391c28f361f7ca21765aff4b9a..5c973bec71b1e22b34e8779ba382ba8388fd5754 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 10568595a6cdd0d42ed0b38fc00c2addfd3f68b4..7ca0d02baf33ff34fefc7040cd8769ed29cdf824 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 948ace430770b27f4dcf0c58deda789755a44f63..b1cbb1086aa341c731715497c1f09d3298cb863c 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 0281903980dcac298af2284fa256a9215cda3882..0b93809a66ed96bb7b713cf40c388ea667f190de 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 f240c5614f6f0f50c267fc89071e66bb5bbef213..ff279d86ac105b5b41da92be283bc83396120753 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 abc1815b8f70d0de1ebb47589aa1d40c8a93f72c..6f31d9300992ae7366323a75a3074684448c5ace 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 59a8776b626e7ee07b3f67a52054e304296dbcd5..0371715ba7c400fdf6c2f9ab506559d1e9995b86 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 bd7744725e0431df54bdc3f0d8d0400d941dac10..84d25ad83caf307c6b7049f9a40b0a973c393569 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 a616ce13205741b0118c5332802443f18652ed4a..231842b8828a83cfe48ca8c457da0d4b4629ff60 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 0d62eaaf84e2f52bc7af2cdaa06fd50cfef2bbee..25eb6a8e8e833a733ba7a10139db1034bb268de8 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 1b7ae272770a6de462c3140bd198644baf983431..3ca0b38ad2361eb159c445f83d6079adeaa98530 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 bbfba26599e69acd5c56c663bd078dc9a0987366..88c3077223f2ea20ba85374f2c1c196e96e00b09 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 fa0fd8d8f2408c533ab022c08e1c7d2ef36e277b..9ff1caca57eb4bba494eccd8ae5ef22c606a1ed4 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 3626462dad4267c74472820d2a84b57a057f483b..bc05cbce94261939029d686f700c33033161a10f 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 ffb06bf95d1f98e87981c711896b31f94cc48e49..4106267fb0cb311ba93d3a0119b3eeb9ecb5ab91 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 62d14e7bf85fa8ab02c41cfcee411b10f36862b5..913142a0d4ae37dc5d1f4c9859db01f5143a3e88 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 2b34f44a8b655bf9040a167dca201d45e96e92f2..302cff98d1d0bc23328c16f5c1f008b1bf8efd7b 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 26aa4c504f745781b041c6b7a2385a3807923fa5..f5d58979eaaaede926b9217b769208fccc7687fa 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 796a57d3b7048e3a0a4ecddca6eebe4dba5e7232..ebefaec892060f1eb069f92fc2a4cc9a77f3f42a 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 8848c717200c60c1e3cc99bbfdd1444785c2e6ce..7e9079696647c847f2551fc6a00ef0cdc0a476ae 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 a4575519ab414111c8f113f0095a3715fa1d64bf..290933883c280907de11208c5b0d7e3676d3bd92 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 c1e4dfa95d9a2fff445544eeee189fdc739a9e7a..7b909dad42cc2e736411cdb4902b307a5b67a56d 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 1f0a79f0de78a6337b54af76931ebdbe14b0fb2a..8cba9265ea99880a5f38abe280c0fc53029844a3 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 cf7053e54b55199958090afd1a51d89d61d50fa4..9f7ac447a3e8a0a6f0bbb81d17e1725689052ee3 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 b96a6f7ada7691fe8c93de40a0f5268527f93a98..53fa7027b7d00dbe16eb84064664f0d81741e819 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 4a2231dd01fda3a1f8cf355f1c94421c405c9258..e2fc9232b818b0e30438568bac6a2d722c9376c5 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 ae00b0b80fe68e4cc995f04e83c66a5a7d45f391..0cbe1b4e61f54941b3a66f0233441d6ad2e1e8a9 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 df228db6b7166822c5e1b585cd3972adecabd984..3004ab943e5970451c4776990991e9057f0b04b0 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 ba62f7893b1fd533643ac68c9fe5b4355b232ec6..0b95c4abd3e53da30b714b253a1b185d5f8d5a1e 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 4db178e425f6e3ebc050c0ae2aadbf63b1b6e1df..6923bd6b1c768fbee2afa0e800304804d476c7cd 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 e6018d64263929cb039b102c01f90724d1f3ee22..a5cec7e1178986efac13f30dabfc83d3da29010b 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 27827cff49876eb463ae004cbb14e6f7c6d3a44a..7f5f1d665b32cf0e5e1ede9dd31178bb9e24bd84 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 bc7e0adb8e48442d9dcdb199d9fbd349bd41bf47..d749c562761f131542095bfd590868864ce65e5b 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 e5483a2c3e68365caf75ba1a58f954e9316faaee..4b43320fcd79d9bff220374bff5695da83283f7b 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 c1a9f54a97364ee13a59d32490472c88746904c9..5ba2e6205a0e9ff075af4ba600f19e6d8b12f424 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 db29abde2421070e35d869a3d9c312b23c6ebe01..73ccd81893fc12c5873abc09514d83349d6e6d82 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 b543d63e6cc55915d882e54b5171a2eb8d86e896..99fff8e75a88a48fc61285323b20a192623c8e4f 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 749e72a0c76399def0fd298bb9803ec905524ec0..8817d7de61851a42207890cb23bb06ca0f9c215e 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 e671dc2b5ea35949f4479ddee26fef994e1d84b9..4c2205cd7e2c820dba281c1e3cfe6b5aeaa18ddb 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 2cb0a10be6248f0176cc0f52d17c1fdc07c1ca98..b250cc5601d4bf6a0e6b91612945b498733e7d55 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 a34dc1ca2aea3510598eb983c90560501dc6319a..78fd87a72c19fa5d04ed92483e94d4090ea6c315 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 7762201b3c983d84deba597fdd9edb7155ea0ae7..67a3016088ff01b20943fe767301bfd1595135e4 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 810622e8288ff9c9c098325a2a734dcb402de729..6f5d4d4ba128a023437084f43b1458715d45b8e3 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 e663d8a2ea2baf75e6c675463a8b18f1c0e9f56c..66cccb99471dce0dddbe1419bc600a712e0452df 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 91ded4f42c4b23ee2e9dfaf25a82f52ecd0f3a7d..5a4a52513dfeaa4de0652c24553489da47a2fa77 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 d63d957219fcd4c90fe99c4208d796784d9557bc..9bae90b0e437c9edebeedb2435d2e5eae2b7d628 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 660b31d4a85e33449966cb437ff2f27233eca609..2df9300ece15193e37f7d8af00a07bf71dc625f9 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 c49fb1ecbf93f2b8b45663daca7654165ff020dc..3422d65d60c0da91723a0781ed3a494fea08f178 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 e134bcd0160625c42d2aa98381733a9681191330..4d8a45a38149a7bbf58f51a9f53ecad5b311f517 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 1262eecf09f786a024b61c3d0e18ce5147f63541..ce4f642588ced647287277def978e0ebf43c23f6 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 24b98783215e6292f54bc606591f642282b48163..791892d7380fa22c6107a88b5e0f0f7c18576a3e 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 4ca94079571c480836af7e042d1624553cad141f..f89cdeee229a60d791004f19ce9929a156808e9f 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 b6b8eebcee8e6fb92aa9eeb906704acd64e44601..09c8fa0e65a0ec302cde2962dc3c98cf5b09d979 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 31274117c7307eb1935df46e7477b6fdf40ad85c..ceac793ee8b0ed5ac105e951d427a925af2d402c 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 fc9d8c794d1849bbb50d72a298cfe530b395c4bb..d095e19ad8b84745a69f092198edde65d504d153 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 fccfba8feabd4a158c9a5fdc06937fb96e5782fc..59fa04d018bd8245aca9268b199f3e0aba932cf9 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 9581c626abf8596488dd91c35e654fca0e97f766..520e601f4c197b31c1c9510f63faf5113a708fcc 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 0b3bd37ce5720537d7b6b26e1ff58350be37b01c..e95d50cdf4b11ea868fd379a8fbe445344d24e47 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 9a1e6e3bf534bb3365ed3122a09d48cfc8337adc..1a7d73b83344f91d5941f763dfae90cebbff633e 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 40a5a34c784a1d401b0e20c3b1471f9c85191234..5344eb43039c9e0f81efaa469d29f3af5cc43e1f 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 538cb2998034d166ec8378dda04f741abb11eb7f..b5c729def9bd8a808213fe26d9519b2d88be4870 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 cb6c10e9d8d405c1be47d65a766b168ad8f1c2f4..1c4dd824fb2f84fc9d9c2dd9864bf2bc48306076 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 5458519195d27158f53479b601dc63dddbf2ad34..2155a3b47519522db490b1c9423128004d9c647a 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 349560b1cc7e15584a54910caf4c63a76fcb9631..0dc670fe1058b61d0615f9ae65ebb67f20695479 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 d85be10ce7fd6afdb48b209c558cbacba5f5df31..69b4945fd102fedcc9a0b7fbbb2f3a8d7ee4d06d 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 00e78b4322dffb7187a55cacbbe997c030dd267d..065697b482c7e5f00a259839ab90939df953801d 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 d9c55f15994851d311e855af7bcf1658a243a286..67a63e65dde22b6205939bf790cb66a1102c02c0 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 f7bf1b9a84612849bb646a79ca78fbc91d012bc3..9b4add646a5f47c648734a40fa7801160cc340db 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 c6fd8d4501c384201692cd7b50bff2d644cd5c67..ca2450727969bf23cf763ca3092778ebda2b3688 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 4a669958c7ca2061e62aa54580bb4b390d88f645..aa5f2dccc6af8bcb0f11d1da68c5ba485d441b19 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 854747cb01205b61f16d70d6d15001bdba8da9bd..873dff5be19064d6de30e5bca8efed5805513a16 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 f006268c5cffc48f092cd30cf96079ddc40f907d..81e7a79d50615a6c3806518ea139117a635deb48 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 9ffbcb52c764161dc6c378b8b17144949b90d75b..382715c7987f7825bc07be8a6caf6f221d1dc274 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 d1978135c599daf5a0aacb6a8c62753fbd1b06ec..476e8c06d72e7ff68d71dd5ae309c825e2a0c3cf 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 9e99d01277fb462f3258650f57d1b1663ae08575..898f80060fcdd3ffedb586ad2a38e4cb9187f137 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 4be92476d8947a4f50572286a636c7626cc9b1ac..6011744b94abab5120ac1e77cbe8c44249e6a8cf 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");