Rename CONFIG_DEBUG_VERBOSE to CONFIG_DEBUG_INFO

Documentation/UsbTrace.html

@@ -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_VERBOSE</code>, <code>CONFIG_USB</code>
+  <li><code>CONFIG_DEBUG</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

@@ -411,16 +411,15 @@ config ARCH_HAVE_HEAPCHECK
 
 if DEBUG
 
-config DEBUG_VERBOSE
-	bool "Enable Debug Verbose Output"
+comment "Debug SYSLOG Output Controls"
+
+config CONFIG_DEBUG_INFO
+	bool "Enable Informational Debug Output"
 	default n
 	---help---
-		Enables verbose debug output (assuming debug features are enabled).
-		As a general rule, when DEBUG is enabled only errors will be
-		reported in the debug SYSLOG output.  But if you also enable
-		DEBUG_VERBOSE, then very chatty (and often annoying) output will be
-		generated.  This means there are two levels of debug output:
-		errors-only and everything.
+		Enables verbose "informational" debug output.  If you enable
+		CONFIG_DEBUG_INFO, then very chatty (and often annoying) output
+		will be generated.
 
 comment "Subsystem Debug Options"
 

arch/arm/src/arm/up_assert.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG
-#  undef  CONFIG_DEBUG_VERBOSE
+#  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG 1
-#  define CONFIG_DEBUG_VERBOSE 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdarg.h>

arch/arm/src/arm/up_dataabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/arm/up_prefetchabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/arm/up_syscall.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/arm/up_undefinedinsn.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv6-m/up_assert.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-a/arm_assert.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-a/arm_dataabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-a/arm_prefetchabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-a/arm_syscall.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-a/arm_undefinedinsn.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-m/up_assert.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-r/arm_assert.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-r/arm_dataabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-r/arm_prefetchabort.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-r/arm_syscall.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

arch/arm/src/armv7-r/arm_undefinedinsn.c

@@ -45,9 +45,9 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 # undef  CONFIG_DEBUG
-# undef  CONFIG_DEBUG_VERBOSE
+# undef  CONFIG_DEBUG_INFO
 # define CONFIG_DEBUG 1
-# define CONFIG_DEBUG_VERBOSE 1
+# define CONFIG_DEBUG_INFO 1
 #endif
 
 #include <stdint.h>

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_VERBOSE, and CONFIG_DEBUG_NET have to be
+  /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
    * defined or the following does nothing.
    */
 

arch/arm/src/efm32/efm32_adc.c

@@ -716,7 +716,7 @@ endif /* defined(ADC_COUNT) && (ADC_COUNT > 0) */
 #ifdef ADC_HAVE_TIMER
 static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg)
 {
-#if defined(CONFIG_DEBUG_ANALOG) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_ANALOG) && defined(CONFIG_DEBUG_INFO)
   avdbg("%s:\n", msg);
   avdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
         tim_getreg(priv, EFM32_GTIM_CR1_OFFSET),

arch/arm/src/efm32/efm32_pwm.c

@@ -84,7 +84,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) efm32_dumpgpio(p,m)
@@ -136,7 +136,7 @@ static uint32_t pwm_getreg(struct efm32_pwmtimer_s *priv, int offset);
 static void pwm_putreg(struct efm32_pwmtimer_s *priv, int offset,
                        uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg);
 #else
 #  define pwm_dumpregs(priv,msg)
@@ -323,7 +323,7 @@ static void pwm_putreg(struct efm32_pwmtimer_s *priv, int offset, uint32_t value
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg)
 {
   /* TODO debug pwm_dumpregs */

arch/arm/src/efm32/efm32_rmu.h

@@ -51,13 +51,13 @@
 /* Configuration ************************************************************/
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_EFM32_RMU_DEBUG
 #endif
 
 #ifdef CONFIG_EFM32_RMU_DEBUG
 #  define rmudbg lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define rmuvdbg lldbg
 #  else
 #    define rmuvdbg(x...)

arch/arm/src/efm32/efm32_spi.c

@@ -95,13 +95,13 @@
 /* Check if SPI debug is enabled */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/efm32/efm32_timer.c

@@ -70,7 +70,7 @@
 #ifdef CONFIG_DEBUG_TIMER
 #  define efm32_timerdbg              dbg
 #  define efm32_timerlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define efm32_timervdbg           vdbg
 #    define efm32_timerllvdbg         llvdbg
 #    define efm32_timer_dumpgpio(p,m) efm32_dumpgpio(p,m)
@@ -137,7 +137,7 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg)
 
   for (i = 0; i < EFM32_TIMER_NCC; i++)
     {
-#if defined(CONFIG_DEBUG_TIMER) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_TIMER) && defined(CONFIG_DEBUG_INFO)
       uintptr_t base_cc = base + EFM32_TIMER_CC_OFFSET(i);
 #endif
       efm32_timervdbg("CC%d => CTRL: %04x    CCV:  %04x  CCVP: %04x CCVB: %04x\n",

arch/arm/src/kinetis/kinetis_pwm.c

@@ -85,7 +85,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) kinetis_pindump(p,m)
@@ -126,7 +126,7 @@ struct kinetis_pwmtimer_s
 static uint32_t pwm_getreg(struct kinetis_pwmtimer_s *priv, int offset);
 static void pwm_putreg(struct kinetis_pwmtimer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg);
 #else
 #  define pwm_dumpregs(priv,msg)
@@ -260,7 +260,7 @@ static void pwm_putreg(struct kinetis_pwmtimer_s *priv, int offset, uint32_t val
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 {
   int nchannels = (priv->tpmid == 0) ? 8 : 2;

arch/arm/src/kinetis/kinetis_sdhc.c

@@ -89,7 +89,7 @@
 #  define CONFIG_KINETIS_SDHC_DMAPRIO DMA_CCR_PRIMED
 #endif
 
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_VERBOSE)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_INFO)
 #  undef CONFIG_SDIO_XFRDEBUG
 #endif
 

arch/arm/src/kinetis/kinetis_usbdev.c

@@ -370,7 +370,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #  define CONFIG_KHCI_USBDEV_BDTDEBUG 1
 
 #  define regdbg lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define regvdbg lldbg
 #  else
 #    define regvdbg(x...)
@@ -390,7 +390,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #ifdef CONFIG_KHCI_USBDEV_BDTDEBUG
 
 #  define bdtdbg lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define bdtvdbg lldbg
 #  else
 #    define bdtvdbg(x...)

arch/arm/src/kl/kl_pwm.c

@@ -82,7 +82,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) kl_dumpgpio(p,m)
@@ -122,7 +122,7 @@ struct kl_pwmtimer_s
 static uint32_t pwm_getreg(struct kl_pwmtimer_s *priv, int offset);
 static void pwm_putreg(struct kl_pwmtimer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg);
 #else
 #  define pwm_dumpregs(priv,msg)
@@ -253,7 +253,7 @@ static void pwm_putreg(struct kl_pwmtimer_s *priv, int offset, uint32_t value)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 {
   int nchannels = (priv->tpmid == 0) ? 6 : 2;

arch/arm/src/kl/kl_spi.c

@@ -67,12 +67,12 @@
  *
  * CONFIG_DEBUG         - Define to enable general debug features
  * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc11xx/lpc11_spi.c

@@ -76,12 +76,12 @@
  *
  * CONFIG_DEBUG         - Define to enable general debug features
  * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc11xx/lpc11_ssp.c

@@ -77,12 +77,12 @@
  *
  * CONFIG_DEBUG         - Define to enable general debug features
  * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc11xx/lpc11_timer.c

@@ -91,7 +91,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
@@ -133,7 +133,7 @@ struct lpc11_timer_s
 static uint32_t timer_getreg(struct lpc11_timer_s *priv, int offset);
 static void timer_putreg(struct lpc11_timer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void timer_dumpregs(struct lpc11_timer_s *priv, FAR const char *msg);
 #else
 #  define timer_dumpregs(priv,msg)
@@ -242,7 +242,7 @@ static void timer_putreg(struct lpc11_timer_s *priv, int offset,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void timer_dumpregs(struct lpc11_timer_s *priv, FAR const char *msg)
 {
   pwmdbg("%s:\n", msg);

arch/arm/src/lpc17xx/lpc17_mcpwm.c

@@ -90,7 +90,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
@@ -132,7 +132,7 @@ struct lpc17_mcpwmtimer_s
 static uint32_t mcpwm_getreg(struct lpc17_mcpwmtimer_s *priv, int offset);
 static void mcpwm_putreg(struct lpc17_mcpwmtimer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void mcpwm_dumpregs(struct lpc17_mcpwmtimer_s *priv, FAR const char *msg);
 #else
 #  define mcpwm_dumpregs(priv,msg)
@@ -242,7 +242,7 @@ static void mcpwm_putreg(struct lpc17_mcpwmtimer_s *priv, int offset, uint32_t v
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv,
                            FAR const char *msg)
 {

arch/arm/src/lpc17xx/lpc17_pwm.c

@@ -108,7 +108,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
@@ -150,7 +150,7 @@ struct lpc17_pwmtimer_s
 static uint32_t pwm_getreg(struct lpc17_pwmtimer_s *priv, int offset);
 static void pwm_putreg(struct lpc17_pwmtimer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg);
 #else
 #  define pwm_dumpregs(priv,msg)
@@ -258,7 +258,7 @@ static void pwm_putreg(struct lpc17_pwmtimer_s *priv, int offset, uint32_t value
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg)
 {
   pwmvdbg("%s:\n", msg);

arch/arm/src/lpc17xx/lpc17_sdcard.c

@@ -94,7 +94,7 @@
  *     operate with only a single data line (the default is to use all
  *     4 SD data lines).
  *   CONFIG_DEBUG_SDIO - Enables some very low-level debug output
- *     This also requires CONFIG_DEBUG_FS and CONFIG_DEBUG_VERBOSE
+ *     This also requires CONFIG_DEBUG_FS and CONFIG_DEBUG_INFO
  */
 
 #if defined(CONFIG_SDIO_DMA) && !defined(CONFIG_LPC17_GPDMA)

arch/arm/src/lpc17xx/lpc17_spi.c

@@ -76,12 +76,12 @@
  *
  * CONFIG_DEBUG         - Define to enable general debug features
  * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc17xx/lpc17_ssp.c

@@ -77,12 +77,12 @@
  *
  * CONFIG_DEBUG         - Define to enable general debug features
  * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc17xx/lpc17_timer.c

@@ -91,7 +91,7 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
@@ -133,7 +133,7 @@ struct lpc17_timer_s
 static uint32_t timer_getreg(struct lpc17_timer_s *priv, int offset);
 static void timer_putreg(struct lpc17_timer_s *priv, int offset, uint32_t value);
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void timer_dumpregs(struct lpc17_timer_s *priv, FAR const char *msg);
 #else
 #  define timer_dumpregs(priv,msg)
@@ -242,7 +242,7 @@ static void timer_putreg(struct lpc17_timer_s *priv, int offset,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
 static void timer_dumpregs(struct lpc17_timer_s *priv, FAR const char *msg)
 {
   pwmdbg("%s:\n", msg);

arch/arm/src/lpc2378/lpc23xx_spi.c

@@ -80,7 +80,7 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)

arch/arm/src/lpc31xx/lpc31_ehci.c

@@ -125,7 +125,7 @@
 /* Simplify DEBUG checks */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
 
@@ -4887,7 +4887,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
 {
   FAR struct usbhost_hubport_s *hport;
   uint32_t regval;
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -5140,7 +5140,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
 
   lpc31_putreg(EHCI_INT_ALLINTS, &HCOR->usbsts);
 
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   /* Show the EHCI version */
 
   regval16 = lpc31_swap16(HCCR->hciversion);

arch/arm/src/lpc43xx/lpc43_ehci.c

@@ -117,7 +117,7 @@
 /* Simplify DEBUG checks */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
 
@@ -4711,7 +4711,7 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller)
 {
   FAR struct usbhost_hubport_s *hport;
   uint32_t regval;
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -4948,7 +4948,7 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller)
 
   lpc43_putreg(EHCI_INT_ALLINTS, &HCOR->usbsts);
 
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   /* Show the EHCI version */
 
   regval16 = lpc43_swap16(HCCR->hciversion);

arch/arm/src/lpc43xx/lpc43_spi.c

@@ -68,13 +68,13 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)
 #  endif
 #else
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  define spidbg(x...)
 #  define spivdbg(x...)
 #endif

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_VERBOSE,
+ *   *lot* of debug output!  Also required CONFIG_DEBUG, 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_VERBOSE) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
 #  undef CONFIG_DEBUG_SPIFI_DUMP
 #endif
 

arch/arm/src/sam34/Kconfig

@@ -1369,7 +1369,7 @@ config SAM34_HSMCI_WRPROOF
 
 config SAM34_HSMCI_XFRDEBUG
 	bool "HSMCI transfer debug"
-	depends on DEBUG_FS && DEBUG_VERBOSE
+	depends on DEBUG_FS && CONFIG_DEBUG_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI data transfers.
@@ -1377,11 +1377,11 @@ config SAM34_HSMCI_XFRDEBUG
 		registers at key points in the data transfer and then dumps all of
 		the registers at the end of the transfer.  If DEBUG_DMA is also
 		enabled, then DMA register will be collected as well.  Requires also
-		DEBUG_FS and DEBUG_VERBOSE.
+		DEBUG_FS and CONFIG_DEBUG_INFO.
 
 config SAM34_HSMCI_CMDDEBUG
 	bool "HSMCI command debug"
-	depends on DEBUG_FS && DEBUG_VERBOSE
+	depends on DEBUG_FS && CONFIG_DEBUG_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI commands. This
@@ -1389,7 +1389,7 @@ config SAM34_HSMCI_CMDDEBUG
 		key points in the data transfer and then dumps all of the registers
 		at the end of the transfer.  If DEBUG_DMA is also enabled, then DMA
 		register will be collected as well.  Requires also DEBUG_FS and
-		DEBUG_VERBOSE.
+		CONFIG_DEBUG_INFO.
 
 endmenu # HSMCI device driver options
 endif # SAM34_HSMCI

arch/arm/src/sam34/sam_emac.c

@@ -419,7 +419,7 @@ static int  sam_ioctl(struct net_driver_s *dev, int cmd, long arg);
 
 /* PHY Initialization */
 
-#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_DEBUG_INFO)
 static void sam_phydump(struct sam_emac_s *priv);
 #else
 #  define sam_phydump(priv)
@@ -2588,7 +2588,7 @@ static int sam_ioctl(struct net_driver_s *dev, int cmd, long arg)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_DEBUG_INFO)
 static void sam_phydump(struct sam_emac_s *priv)
 {
   uint32_t regval;

arch/arm/src/sam34/sam_hsmci.c

@@ -104,7 +104,7 @@
 
 #define SAM34_HSMCI_PRIO NVIC_SYSH_PRIORITY_DEFAULT
 
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_VERBOSE)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_INFO)
 #  undef CONFIG_SAM34_HSMCI_CMDDEBUG
 #  undef CONFIG_SAM34_HSMCI_XFRDEBUG
 #endif

arch/arm/src/sam34/sam_spi.c

@@ -137,7 +137,7 @@
  */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAM34_SPI_DMADEBUG
 #  undef CONFIG_SAM34_SPI_REGDEBUG
@@ -149,7 +149,7 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
-#  ifdef CONFIG_DEBUG_VERBOSE
+#  ifdef CONFIG_DEBUG_INFO
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)
@@ -252,7 +252,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
                   unsigned int offset);
 static inline struct sam_spidev_s *spi_device(struct sam_spics_s *spics);
 
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
 static void     spi_dumpregs(struct sam_spidev_s *spi, const char *msg);
 #else
 # define        spi_dumpregs(spi,msg)
@@ -520,7 +520,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
 static void spi_dumpregs(struct sam_spidev_s *spi, const char *msg)
 {
   spivdbg("%s:\n", msg);

arch/arm/src/sama5/Kconfig

@@ -2857,7 +2857,7 @@ config SAMA5_HSMCI_WRPROOF
 
 config SAMA5_HSMCI_XFRDEBUG
 	bool "HSMCI transfer debug"
-	depends on DEBUG_FS && DEBUG_VERBOSE
+	depends on DEBUG_FS && CONFIG_DEBUG_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI data transfers.
@@ -2865,11 +2865,11 @@ config SAMA5_HSMCI_XFRDEBUG
 		registers at key points in the data transfer and then dumps all of
 		the registers at the end of the transfer.  If DEBUG_DMA is also
 		enabled, then DMA register will be collected as well.  Requires also
-		DEBUG_FS and DEBUG_VERBOSE.
+		DEBUG_FS and CONFIG_DEBUG_INFO.
 
 config SAMA5_HSMCI_CMDDEBUG
 	bool "HSMCI command debug"
-	depends on DEBUG_FS && DEBUG_VERBOSE
+	depends on DEBUG_FS && CONFIG_DEBUG_INFO
 	default n
 	---help---
 		Enable special debug instrumentation analyze HSMCI commands. This
@@ -2877,7 +2877,7 @@ config SAMA5_HSMCI_CMDDEBUG
 		key points in the data transfer and then dumps all of the registers
 		at the end of the transfer.  If DEBUG_DMA is also enabled, then DMA
 		register will be collected as well.  Requires also DEBUG_FS and
-		DEBUG_VERBOSE.
+		CONFIG_DEBUG_INFO.
 
 config SAMA5_HSMCI_REGDEBUG
 	bool "HSMCI Register level debug"
@@ -3907,9 +3907,9 @@ config SAMA5_TC_DEBUG
 	default n
 	---help---
 		Output high level Timer/Counter device debug information.
-		Requires also DEBUG.  If this option AND DEBUG_VERBOSE are
+		Requires also DEBUG.  If this option AND CONFIG_DEBUG_INFO are
 		enabled, then the system will be overwhelmed the timer debug
-		output.  If DEBUG_VERBOSE is disabled, then debug output will
+		output.  If CONFIG_DEBUG_INFO is disabled, then debug output will
 		only indicate if/when timer-related errors occur.  This
 		latter mode is completely usable.
 

arch/arm/src/sama5/sam_ehci.c

@@ -130,7 +130,7 @@
 /* Simplify DEBUG checks */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
 
@@ -4701,7 +4701,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
   FAR struct usbhost_hubport_s *hport;
   irqstate_t flags;
   uint32_t regval;
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -4952,7 +4952,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
 
   sam_putreg(EHCI_INT_ALLINTS, &HCOR->usbsts);
 
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
   /* Show the EHCI version */
 
   regval16 = sam_swap16(HCCR->hciversion);