Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES

Documentation/NuttxPortingGuide.html

@@ -802,7 +802,7 @@
     <p>
       Definitions in the <code>Make.defs</code> file probably depend on some of the
       settings in the .<code>config</code> file.  For example, the <code>CFLAGS</code> will most likely be
-      different if <code>CONFIG_DEBUG=y</code>.
+      different if <code>CONFIG_DEBUG_FEATURES=y</code>.
     </p>
     <p>
       The included <code>tools/Config.mk</code> file contains additional definitions that may

Documentation/UsbTrace.html

@@ -125,7 +125,7 @@
 </p>
 <ul>
   <li><code>CONFIG_USBDEV_TRACE</code>, or</li>
-  <li><code>CONFIG_DEBUG and CONFIG_DEBUG_USB</code></li>
+  <li><code>CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB</code></li>
 </ul>
 <p><b>Log Data Sink</b>.
   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 <code>apps/examples/usbserial</code> for an LPC1768 platform with the following NuttX configuration settings:
 </p>
 <ul>
-  <li><code>CONFIG_DEBUG</code>, <code>CONFIG_DEBUG_INFO</code>, <code>CONFIG_USB</code>
+  <li><code>CONFIG_DEBUG_FEATURES</code>, <code>CONFIG_DEBUG_INFO</code>, <code>CONFIG_USB</code>
   <li><code>CONFIG_EXAMPLES_USBSERIAL_TRACEINIT</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECLASS</code>,
     <code>CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER</code>,
     <code>CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS</code>

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

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,

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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) */

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
 

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
 

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

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'

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
 

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
 

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
 

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)

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
 

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 */

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)

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
 

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
 

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

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

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
 

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
 

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
 

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",

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
 

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)

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
 

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
 

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
 

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
 

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
 

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",

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.
    */
 

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)

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

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;

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;