diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index 7efb7ebccb..03530cbfb6 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -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_VERBOSE, CONFIG_USB
+ CONFIG_DEBUG, 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 17d6e351f9..d8eafff5d2 100644
--- a/Kconfig
+++ b/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"
diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index 336a76c861..e8e6b8dbb9 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/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
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 2ab00b15c9..c6586832cf 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/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
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index ed2bfb1bf9..c827a38868 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/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
diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c
index 07d8ac26d2..6c8ba18e44 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/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
diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c
index 99b1e3fc66..468d55e6af 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/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
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index dcb7139269..8106eaf10e 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/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
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index ab3bd4c908..6299a46241 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/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
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 818557c552..38a9cbe4b5 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/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
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index bdd28c4a3a..f06150772b 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/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
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 854ece3de2..10e0569d1f 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/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
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 0c051d9dd9..208ca5068c 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/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
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index 0f6fa00d21..70fdfcd95d 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/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
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 11dd9fad09..a7082e9173 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/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
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index 789fb0f5ad..9366c5d1c2 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/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
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index bf16d19467..e6e4607b0d 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/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
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 3e41a34843..401835a556 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/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
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index b1db4f8868..f9716239c3 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/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
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 5d1ddb6863..671f3fe59b 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_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.
*/
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 53cb731ad6..66010104cf 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/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),
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index c4f42d1712..175903511b 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/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 */
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index 0aae6fbb0d..b6983a06a5 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/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...)
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 05c0ab7c51..ad2055d79f 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/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...)
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index 19c50b56c2..1788723c6e 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/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",
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 23438917f7..1091b88b28 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/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;
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 7841cc1ad5..72754437ea 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/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
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 6bb47d5e3b..936ea7192f 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/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...)
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 0e2fa2149e..266bb41770 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/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;
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 0b738aedf5..741e75c371 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/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...)
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index 178bd77c36..e0422372c2 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/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...)
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index c94eac7692..0e1889c3be 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/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...)
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index d53b6b40db..01c2554279 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/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);
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index dd3e71de26..831132a3d6 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/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)
{
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index f33938beae..66794cdc65 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/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);
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index e6cb9fafd7..a00fd6ffaa 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/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)
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index c915d1dfc2..06a6659264 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/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...)
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index 9cdee09242..a99c061727 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/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...)
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 2cd143fccc..4cbe8238f1 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/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);
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index 42c951c954..fa20e563a6 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/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...)
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 67ef095f2d..83ae348776 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/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);
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 08b2ae8e0f..b1de82ab53 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/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);
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 32b5a45913..46eda5576d 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/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
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index 0d90ea9fce..41b1703f97 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_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
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index b704da5674..b588bae2cc 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/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
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index c11332586a..957ea10d34 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/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;
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index 21e9098cd5..d84fb0175f 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/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
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 424d921844..203ec5a1df 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/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);
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index b2701131bc..da7da52e39 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/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.
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index a6cb3d0d7a..9c5dbd211a 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/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);
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index a4f895760d..69b6db2cb3 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -390,7 +390,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)
@@ -2260,7 +2260,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;
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index 270acd635b..65eb01e7fd 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -536,7 +536,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)
@@ -3014,7 +3014,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;
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 7db62d10db..a242093746 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -315,7 +315,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_gmac_s *priv);
#else
# define sam_phydump(priv)
@@ -2211,7 +2211,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_gmac_s *priv)
{
uint16_t phyval;
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 54a7e34d9a..3a44973373 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -162,7 +162,7 @@
# error "This driver requires CONFIG_SDIO_BLOCKSETUP"
#endif
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_VERBOSE)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_INFO)
# undef CONFIG_SAMA5_HSMCI_CMDDEBUG
# undef CONFIG_SAMA5_HSMCI_XFRDEBUG
#endif
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 8032bb04f4..90a15d4053 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -1291,7 +1291,7 @@ static void sam_dmasetup(int lid, struct sam_dscr_s *dscr, uint8_t *buffer)
sam_putreg(g_layernext[lid], physdscr);
}
-#if defined(CONFIG_DEBUG_GRAPHICS) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_GRAPHICS) && defined(CONFIG_DEBUG_INFO)
/* Dump the DMA setup */
gvdbg("DMA descriptor: addr=%08x ctrl=%08x next=%08x\n",
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index e03db0d932..af6edf98bf 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -403,7 +403,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
# else
@@ -480,7 +480,7 @@ static bool pwm_checkreg(FAR struct sam_pwm_s *chan, bool wr, uint32_t regval,
static uint32_t pwm_getreg(FAR struct sam_pwm_chan_s *chan, int offset);
static void pwm_putreg(FAR struct sam_pwm_chan_s *chan, int offset, uint32_t regval);
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
static void pwm_dumpregs(FAR struct sam_pwm_chan_s *chan, FAR const char *msg);
#else
# define pwm_dumpregs(chan,msg)
@@ -914,7 +914,7 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO)
static void pwm_dumpregs(struct sam_pwm_chan_s *chan, FAR const char *msg)
{
pwmvdbg("PWM: %s\n", msg);
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 2d370fe7a9..e914af0aa8 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -130,7 +130,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMA5_SPI_DMADEBUG
# undef CONFIG_SAMA5_SPI_REGDEBUG
@@ -142,7 +142,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
@@ -243,7 +243,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)
@@ -509,7 +509,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);
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 52aac74b17..4ea4f5f611 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -398,7 +398,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
@@ -416,7 +416,7 @@
#ifdef CONFIG_DEBUG_I2S
# define i2sdbg dbg
# define i2slldbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define i2svdbg dbg
# define i2sllvdbg lldbg
# else
@@ -539,7 +539,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset,
static inline uintptr_t ssc_physregaddr(struct sam_ssc_s *priv,
unsigned int offset);
-#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO)
static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg);
#else
# define scc_dump_regs(s,m)
@@ -817,7 +817,7 @@ static inline uintptr_t ssc_physregaddr(struct sam_ssc_s *priv,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO)
static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg)
{
i2svdbg("SSC%d: %s\n", priv->sscno, msg);
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index 14df0f62a4..72b9358b65 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -103,7 +103,7 @@
* to transfer on byte. So these define a "long" timeout.
*/
-#if defined(CONFIG_DEBUG_I2C) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2C) && defined(CONFIG_DEBUG_INFO)
# define TWI_TIMEOUT_MSPB (50) /* 50 msec/byte */
#else
# define TWI_TIMEOUT_MSPB (5) /* 5 msec/byte */
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index 2a7df796ba..35aa6cfc76 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -85,14 +85,14 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMDL_SPI_REGDEBUG
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
@@ -175,7 +175,7 @@ static uint32_t spi_getreg32(struct sam_spidev_s *priv,
static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval,
unsigned int offset);
-#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 *priv, const char *msg);
#else
# define spi_dumpregs(priv,msg)
@@ -739,7 +739,7 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval,
*
****************************************************************************/
-#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 *priv, const char *msg)
{
spivdbg("%s:\n", msg);
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index 7a7d75c840..e5d70d93a7 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -1555,9 +1555,9 @@ config SAMV7_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.
@@ -1617,7 +1617,7 @@ config SAMV7_HSMCI_UNALIGNED
config SAMV7_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.
@@ -1625,11 +1625,11 @@ config SAMV7_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 SAMV7_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
@@ -1637,7 +1637,7 @@ config SAMV7_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 SAMV7_HSMCI_REGDEBUG
bool "HSMCI Register level debug"
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index 39e14457dd..4f2384b9cb 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -639,7 +639,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)
@@ -3464,7 +3464,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;
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 89d16b3792..ccea194a24 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -98,7 +98,7 @@
# error "This driver requires CONFIG_SDIO_BLOCKSETUP"
#endif
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_VERBOSE)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_INFO)
# undef CONFIG_SAMV7_HSMCI_CMDDEBUG
# undef CONFIG_SAMV7_HSMCI_XFRDEBUG
#endif
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index e63a6ce22b..150739dfd4 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -143,7 +143,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMV7_QSPI_DMADEBUG
# undef CONFIG_SAMV7_QSPI_REGDEBUG
@@ -155,7 +155,7 @@
#ifdef CONFIG_DEBUG_SPI
# define qspidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define qspivdbg lldbg
# else
# define qspivdbg(x...)
@@ -243,7 +243,7 @@ static inline uint32_t qspi_getreg(struct sam_qspidev_s *priv,
static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value,
unsigned int offset);
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void qspi_dumpregs(struct sam_qspidev_s *priv, const char *msg);
#else
# define qspi_dumpregs(priv,msg)
@@ -474,7 +474,7 @@ static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void qspi_dumpregs(struct sam_qspidev_s *priv, const char *msg)
{
qspivdbg("%s:\n", msg);
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 0d9f1ec32a..b03a9dd7c6 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -125,7 +125,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMV7_SPI_DMADEBUG
# undef CONFIG_SAMV7_SPI_REGDEBUG
@@ -137,7 +137,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
@@ -238,7 +238,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)
@@ -515,7 +515,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);
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index a210541ce6..317d7955c4 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -80,13 +80,13 @@
*/
#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...)
@@ -153,7 +153,7 @@ static uint32_t spi_getreg(struct sam_spidev_s *priv,
static void spi_putreg(struct sam_spidev_s *priv, uint32_t value,
unsigned int offset);
-#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 *priv, const char *msg);
#else
# define spi_dumpregs(priv,msg)
@@ -348,7 +348,7 @@ static void spi_putreg(struct sam_spidev_s *priv, 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 *priv, const char *msg)
{
spivdbg("%s:\n", msg);
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 107d120de7..32abed171c 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -371,7 +371,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
@@ -389,7 +389,7 @@
#ifdef CONFIG_DEBUG_I2S
# define i2sdbg dbg
# define i2slldbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define i2svdbg dbg
# define i2sllvdbg lldbg
# else
@@ -512,7 +512,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset,
static inline uintptr_t ssc_regaddr(struct sam_ssc_s *priv,
unsigned int offset);
-#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO)
static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg);
#else
# define scc_dump_regs(s,m)
@@ -789,7 +789,7 @@ static inline uintptr_t ssc_regaddr(struct sam_ssc_s *priv, unsigned int offset)
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO)
static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg)
{
i2svdbg("SSC%d: %s\n", priv->sscno, msg);
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index fa5a8b2a52..3e2779597b 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -99,7 +99,7 @@
* to transfer on byte. So these define a "long" timeout.
*/
-#if defined(CONFIG_DEBUG_I2C) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_I2C) && defined(CONFIG_DEBUG_INFO)
# define TWIHS_TIMEOUT_MSPB (50) /* 50 msec/byte */
#else
# define TWIHS_TIMEOUT_MSPB (5) /* 5 msec/byte */
diff --git a/arch/arm/src/stm32/stm32.h b/arch/arm/src/stm32/stm32.h
index 7ae058ee05..a1cc224f59 100644
--- a/arch/arm/src/stm32/stm32.h
+++ b/arch/arm/src/stm32/stm32.h
@@ -56,7 +56,7 @@
/* Additional Configuration *********************************************************/
/* Custom debug settings used in the STM32 port. These are managed by STM32-specific
* logic and not the common logic in include/debug.h. NOTE: Some of these also
- * depend on CONFIG_DEBUG_VERBOSE
+ * depend on CONFIG_DEBUG_INFO
*/
#ifndef CONFIG_DEBUG
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index a6f3a5749b..be70eb8007 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -124,7 +124,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)
@@ -204,7 +204,7 @@ struct stm32_pwmtimer_s
static uint16_t pwm_getreg(struct stm32_pwmtimer_s *priv, int offset);
static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_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 stm32_pwmtimer_s *priv, FAR const char *msg);
#else
# define pwm_dumpregs(priv,msg)
@@ -969,7 +969,7 @@ static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_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 stm32_pwmtimer_s *priv, FAR const char *msg)
{
pwmvdbg("%s:\n", msg);
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 5cec5e0874..1d554be642 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -252,7 +252,7 @@
#endif
#ifdef CONFIG_DEBUG_SENSORS
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define qe_dumpgpio(p,m) stm32_dumpgpio(p,m)
# else
# define qe_dumpgpio(p,m)
@@ -317,7 +317,7 @@ static void stm32_putreg16(FAR struct stm32_lowerhalf_s *priv, int offset, uint1
static uint32_t stm32_getreg32(FAR struct stm32_lowerhalf_s *priv, int offset);
static void stm32_putreg32(FAR struct stm32_lowerhalf_s *priv, int offset, uint32_t value);
-#if defined(CONFIG_DEBUG_SENSORS) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SENSORS) && defined(CONFIG_DEBUG_INFO)
static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *msg);
#else
# define stm32_dumpregs(priv,msg)
@@ -631,7 +631,7 @@ static void stm32_putreg32(FAR struct stm32_lowerhalf_s *priv, int offset, uint3
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_SENSORS) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SENSORS) && defined(CONFIG_DEBUG_INFO)
static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *msg)
{
snvdbg("%s:\n", msg);
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index b9bea99351..386eddefeb 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -95,7 +95,7 @@
* CONFIG_SDM_DMAPRIO - SDIO DMA priority. This can be selecte if
* CONFIG_SDIO_DMA is enabled.
* CONFIG_SDIO_XFRDEBUG - 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_STM32_DMA2)
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index eed9ea9845..86d99da736 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -160,13 +160,13 @@
/* Check if (non-standard) 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...)
diff --git a/arch/arm/src/stm32l4/stm32l4.h b/arch/arm/src/stm32l4/stm32l4.h
index c78865577d..11cba6d363 100644
--- a/arch/arm/src/stm32l4/stm32l4.h
+++ b/arch/arm/src/stm32l4/stm32l4.h
@@ -56,7 +56,7 @@
/* Additional Configuration *********************************************************/
/* Custom debug settings used in the STM32L4 port. These are managed by
* STM32L4-specific logic and not the common logic in include/debug.h.
- * NOTE: Some of these also depend on CONFIG_DEBUG_VERBOSE
+ * NOTE: Some of these also depend on CONFIG_DEBUG_INFO
*/
#ifndef CONFIG_DEBUG
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 57aa85dac0..723ce2841f 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -90,7 +90,7 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_STM32L4_QSPI_DMADEBUG
# undef CONFIG_STM32L4_QSPI_REGDEBUG
@@ -102,7 +102,7 @@
#ifdef CONFIG_DEBUG_SPI
# define qspidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define qspivdbg lldbg
# else
# define qspivdbg(x...)
@@ -286,7 +286,7 @@ static inline uint32_t qspi_getreg(struct stm32l4_qspidev_s *priv,
static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value,
unsigned int offset);
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg);
#else
# define qspi_dumpregs(priv,msg)
@@ -505,7 +505,7 @@ static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
{
uint32_t regval;
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index b6907d5955..acb9a9ba5a 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -141,13 +141,13 @@
/* Check if (non-standard) 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...)
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index 6870b9eb37..451db9fdf9 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+ * CONFIG_DEBUG_INFO too)
*/
#undef SSI_DEBUG /* Define to enable debug */
@@ -577,7 +577,7 @@ static void ssi_txuint8(struct tiva_ssidev_s *priv)
static void ssi_rxnull(struct tiva_ssidev_s *priv)
{
-#if defined(SSI_DEBUG) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(SSI_DEBUG) && defined(CONFIG_DEBUG_INFO)
uint32_t regval = ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
ssivdbg("RX: discard %04x\n", regval);
#else
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index a82b682d35..fe414afd8f 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 31daafdedb..37a5f25f55 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index 8ea84f017b..d6f71f6e5c 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/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
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 1eab6eb4e3..4911c81145 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_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
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 8b4ae3e50a..4332d3d8c2 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/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
diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index b56d7f2419..3ef9e89df6 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index b5a058f3a6..1b30e58985 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -102,7 +102,7 @@ uint32_t *pic32mx_exception(uint32_t *regs)
asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
asm volatile("\tmfc0 %0,$14,0\n" : "=r"(epc));
-#ifdef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_DEBUG_INFO
switch (cause & CP0_CAUSE_EXCCODE_MASK)
{
case CP0_CAUSE_EXCCODE_INT: /* Interrupt */
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index 78d9acca22..e07a44fc3d 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_VERBOSE) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG) && 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-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index 44e79d6b48..a4388914b1 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -76,7 +76,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 00d9f24093..ca07c9eb56 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -290,7 +290,7 @@
# define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1
# define regdbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define regvdbg lldbg
# else
# define regvdbg(x...)
@@ -310,7 +310,7 @@
#ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG
# define bdtdbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define bdtvdbg lldbg
# else
# define bdtvdbg(x...)
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index ec23ff8c3b..c2ae2d8ed6 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -102,7 +102,7 @@ uint32_t *pic32mz_exception(uint32_t *regs)
asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
asm volatile("\tmfc0 %0,$14,0\n" : "=r"(epc));
-#ifdef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_DEBUG_INFO
switch (cause & CP0_CAUSE_EXCCODE_MASK)
{
case CP0_CAUSE_EXCCODE_INT: /* Interrupt */
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c
index 8bec677343..ae46628585 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_VERBOSE) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG) && 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-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index d2f83fb292..022eaebc3c 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -71,7 +71,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index c8303f2995..2a51031c45 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/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
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index e80fbcb9f5..640564d094 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index ad165c4d2c..289745aaf0 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index 3760aa195e..1058f7959f 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -106,12 +106,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 9c516972f0..30f603b1ac 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -64,13 +64,13 @@
/* Check if (non-standard) 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...)
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 32eb751c56..4a577053f2 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/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
diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c
index 4cc2d8cb36..69924f5141 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index fbd73d2579..dc06d022f6 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/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
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index a4047d56f0..a100010c1c 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.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
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index f6d9e41236..b6f5c66ad2 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index 869cbb79cb..96e7c487ba 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -64,14 +64,14 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_SPI
# undef CONFIG_Z16F_ESPI_REGDEBUG
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg (void)
@@ -127,7 +127,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
# define spi_putreg16(priv,regval,regaddr) putreg16(regval, regaddr)
#endif
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void spi_dumpregs(FAR struct z16f_spi_s *priv, const char *msg);
#else
# define spi_dumpregs(priv,msg)
@@ -327,7 +327,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
static void spi_dumpregs(FAR struct z16f_spi_s *priv, FAR const char *msg)
{
spivdbg("%s:\n", msg);
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index 78e114d35d..222d718070 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/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
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index 32a3fc6830..1de5a0b004 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index 0e523b693a..f5bbf0dedc 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index 1c3a4c73be..8c78148cd3 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index df6c761a7c..c5bfd8251e 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
#include
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index dd83a1eb8c..0f6a701379 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -42,9 +42,9 @@
/* Output debug info -- even if debug is not selected. */
#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
#include
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 7291389eba..45154b0d4d 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -60,11 +60,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_ELF_DUMPBUFFER
#endif
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 4437914ec3..1c416fa660 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 && DEBUG_VERBOSE
+ depends on DEBUG && 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 a4fd589613..1890b78c73 100644
--- a/binfmt/libelf/libelf_bind.c
+++ b/binfmt/libelf/libelf_bind.c
@@ -55,11 +55,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_ELF_DUMPBUFFER
#endif
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index 35414fca18..5ed774d3b0 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -56,11 +56,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_ELF_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_ELF_DUMPBUFFER
#endif
diff --git a/binfmt/libnxflat/Kconfig b/binfmt/libnxflat/Kconfig
index 0a11f8c083..c5f920695d 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 && DEBUG_VERBOSE
+ depends on DEBUG && CONFIG_DEBUG_INFO
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index 3c1709b2a5..ef45aa204d 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -58,11 +58,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_NXFLAT_DUMPBUFFER
#endif
diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c
index 52159c5f03..c66cbe1189 100644
--- a/binfmt/libnxflat/libnxflat_init.c
+++ b/binfmt/libnxflat/libnxflat_init.c
@@ -54,11 +54,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_NXFLAT_DUMPBUFFER
#endif
diff --git a/binfmt/libpcode/Kconfig b/binfmt/libpcode/Kconfig
index 92b09650ff..6005657b6b 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 && DEBUG_VERBOSE
+ depends on DEBUG && 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 d0bbb4ffc3..4c06a5c075 100644
--- a/binfmt/libpcode/README.txt
+++ b/binfmt/libpcode/README.txt
@@ -98,7 +98,7 @@ Here is a simple test configuration using the NuttX simulator:
CONFIG_DEBUG=y
CONFIG_DEBUG_BINFMT=y
- CONFIG_DEBUG_VERBOSE=y
+ CONFIG_DEBUG_INFO=y
4. In lieu of a a real test application, this Quick'n'Dirty patch can be used
to initialize the P-Code binary format:
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index 1c4b454ff9..7eac76e65b 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -56,11 +56,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_NXFLAT_DUMPBUFFER
#endif
diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt
index e128fb71d6..3d3a6e0903 100644
--- a/configs/arduino-due/README.txt
+++ b/configs/arduino-due/README.txt
@@ -1073,7 +1073,7 @@ Configuration sub-directories
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ 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/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index 8921c2d04c..8f14011c9c 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -96,7 +96,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index b461812e50..50360f678f 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index 01c944eb52..6fe52de306 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -88,7 +88,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index 752b00cccf..98d7af6d8f 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index 6cabaff272..4695aa3a4a 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -66,7 +66,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index aadc2ac6db..43f847554c 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index 11fc1c6915..069f9cd5a1 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -51,7 +51,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 6c2b0f86ae..0712075703 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -69,7 +69,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define ssivdbg lldbg
# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
#else
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index 623091f8af..a4b66564c4 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 367c3031c4..0e4216cdc7 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index ab0ea79749..e33b3503f4 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index feea1dacf4..de942a61d0 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index 5c31646712..f699d030da 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -60,7 +60,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index d21868ea62..44908623d0 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -60,7 +60,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index 4b1cf4dfdf..f55229cfb8 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -94,7 +94,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index 10b4f4df9b..a392099770 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -71,7 +71,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index 0cee2dc4a8..fb7fea3f8a 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 106998a223..6beb0a6b78 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 615994d436..a2b16e6650 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index fe55d601b7..ca49dec32a 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 66eb97ef72..ca3b61d97e 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index c4cfa6c95d..f365f264a6 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index b8effce8d0..afc307df76 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index 8250199601..0aa9f273c7 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index 5d5adeb2ec..05c8830eef 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index 6a40bb48b5..b9731da3e6 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -82,12 +82,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -99,7 +99,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) kl_dumpgpio(GPIO_LED_B, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index c674bd4527..522e9d3387 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -59,7 +59,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index a729917dca..5cdf989dd5 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -82,12 +82,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -99,7 +99,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) kl_dumpgpio(GPIO_LED_B, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index 21d4052e82..f155b381a9 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -59,7 +59,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index b808bad2c7..98d8c23e23 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -703,10 +703,10 @@ Where is one of the following:
settings in the configuration file:
-CONFIG_DEBUG=n
- -CONFIG_DEBUG_VERBOSE=n
+ -CONFIG_DEBUG_INFO=n
-CONFIG_DEBUG_USB=n
+CONFIG_DEBUG=y
- +CONFIG_DEBUG_VERBOSE=y
+ +CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_USB=y
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index f65b7a21e2..edc3c0d78b 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index c8889c38a5..6d7662261c 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -70,12 +70,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 8a5cfe69ab..2e724ccc4d 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -48,7 +48,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index 761986041d..f3cd9fbaed 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -94,7 +94,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index c3c4b515a6..2a7a9f0001 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -61,12 +61,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -78,7 +78,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) lpc17_dumpgpio(LINCOLN60_LED2, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index 54bc5c188f..fd763e59d6 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 7643042817..8a0b5659a9 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index 6eee4e35ed..d2bd61374d 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -64,11 +64,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_RITDEBUG
#endif
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index 28f925d26e..5cc7a82f29 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 197a614e79..f29657e76b 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -63,11 +63,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_RITDEBUG
#endif
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 9ffcd0fa31..309ee4526a 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -98,7 +98,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 683b29249c..5d3686df43 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -70,7 +70,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define ssivdbg lldbg
# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
#else
diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt
index 2a95f43456..93f71509e7 100644
--- a/configs/lpc4330-xplorer/README.txt
+++ b/configs/lpc4330-xplorer/README.txt
@@ -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_VERBOSE,
+ *lot* of debug output! Also required CONFIG_DEBUG, 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/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index afe5ecd23f..d3bb157ed6 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -91,12 +91,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index 8075aae7ed..c056405f1d 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -68,12 +68,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpc4337-ws/README.txt b/configs/lpc4337-ws/README.txt
index 9a0d2cb99b..25dec3aad4 100644
--- a/configs/lpc4337-ws/README.txt
+++ b/configs/lpc4337-ws/README.txt
@@ -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_VERBOSE,
+ *lot* of debug output! Also required CONFIG_DEBUG, 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/README.txt b/configs/lpc4357-evb/README.txt
index db2c2611d2..f60934d6bd 100644
--- a/configs/lpc4357-evb/README.txt
+++ b/configs/lpc4357-evb/README.txt
@@ -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_VERBOSE,
+ *lot* of debug output! Also required CONFIG_DEBUG, 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/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index acb63b2554..56bfcd9943 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -88,12 +88,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index 0e8af7c10e..5c05bac6ef 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -79,12 +79,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpc4370-link2/README.txt b/configs/lpc4370-link2/README.txt
index 110b02fd01..492e8c4abc 100644
--- a/configs/lpc4370-link2/README.txt
+++ b/configs/lpc4370-link2/README.txt
@@ -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_VERBOSE,
+ *lot* of debug output! Also required CONFIG_DEBUG, 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/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index f9458b0e57..198750faad 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -60,12 +60,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index c2953a3617..855c716996 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -61,12 +61,12 @@
/* Debug definitions ********************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define LED_VERBOSE 1
# define ledvdbg lldbg
# else
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index a112b4e267..537468ca39 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -57,12 +57,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index 0b56fdc148..142ff6f9b8 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -57,12 +57,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index a6845e1dab..8f180748fe 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -76,11 +76,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index 71108039f4..c878032d9b 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -74,12 +74,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index c54d91e642..7e2453d802 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 22c106a1e4..aa9c3a03f9 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -62,13 +62,13 @@
/* Enables debug output from this file (needs CONFIG_DEBUG too) */
#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...)
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index 4a0c4116c6..5c2d80b50c 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -61,12 +61,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -78,7 +78,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) lpc17_dumpgpio(MBED_LED3, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index 4990a64185..c74dfba0cf 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -90,7 +90,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 0283307623..2a7fdd6976 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -74,12 +74,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index e474514c3a..c8754ae76f 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -75,12 +75,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 97fe553ab6..636d513953 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -95,14 +95,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 4a41600fbf..8fb2a91176 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -58,12 +58,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index 587cf884ec..f362b5d520 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -54,7 +54,7 @@
****************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+ * CONFIG_DEBUG_INFO too)
*/
#undef BUTTON_DEBUG /* Define to enable debug */
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index 22fa22272e..db498825a7 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -53,12 +53,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -70,7 +70,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) m9s12_dumpgpio(m)
#else
# define led_dumpgpio(m)
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index e78621c904..c0822d6f7b 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -55,7 +55,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index a2e4577f15..235cb6ef99 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index db170d7b2c..d90d9ae09d 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index 8644973dbc..8521294c7e 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index 90a28ae0f1..ae2ac5e56d 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index 9a1a0a17f3..ab5faa739e 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -63,12 +63,12 @@
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_SPI
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index 9b02b9af74..3348ac4e51 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index 4f2c7c8da4..4f58d7b1ae 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index a280311138..0c8dc4d328 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index 5dad71caf5..0c941a28b6 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -63,12 +63,12 @@
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_SPI
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index 01d60f55ed..1a7af72a34 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index 87a08c7c8f..2815f7dac0 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -77,12 +77,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -94,7 +94,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) nuc_dumpgpio(GPIO_LED, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index 7c484df2be..4ba0c58407 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt
index f4a3155ede..7739e8dc0e 100644
--- a/configs/olimex-lpc1766stk/README.txt
+++ b/configs/olimex-lpc1766stk/README.txt
@@ -930,7 +930,7 @@ Configuration Sub-Directories
Otherwise, you will have not feedback about what is going on:
CONFIG_DEBUG=y
- CONFIG_DEBUG_VERBOSE=y
+ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FTPC=y
hidkbd:
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 26de717fad..0c084ede73 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -80,11 +80,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_NOKIADBG
#endif
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index 8f83ca967c..4e7c3ff866 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -59,12 +59,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -76,7 +76,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LED1, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index 32117cdf27..430076db4a 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index 8cbbcbd27d..910b53b47d 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -53,7 +53,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index 01bc2b5dae..7e7bf697cb 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index 44d85989e6..e771326ba5 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index a46bfcc970..8c3628b977 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index 289c6beec8..7d01e00343 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -53,7 +53,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index 4e41af6ad3..5cdf82be88 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -55,12 +55,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -72,7 +72,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) stm32_dumpgpio(GPIO_LED_GREEN, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/open1788/README.txt b/configs/open1788/README.txt
index 7d46f0e5cd..4e2fae623f 100644
--- a/configs/open1788/README.txt
+++ b/configs/open1788/README.txt
@@ -439,7 +439,7 @@ CONFIGURATION
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ 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
@@ -464,7 +464,7 @@ CONFIGURATION
Build Setup:
CONFIG_DEBUG=y
- CONFIG_DEBUG_VERBOSE=y
+ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_INPUT=y
7. The button test (apps/examples/buttons) can be built-in by adding
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index b2d5f997c3..5edb1e3114 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -135,12 +135,12 @@
#define LED_IDLE_OFF_CLRBITS ((0) << OFF_CLRBITS_SHIFT)
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -152,7 +152,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) lpc17_dumpgpio(???, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index 033d7933f1..a3a54c4a10 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -65,7 +65,7 @@
#ifdef CONFIG_DEBUG_SPI
# define sspdbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define sspvdbg lldbg
# else
# define sspvdbg(x...)
@@ -77,7 +77,7 @@
/* Dump GPIO registers */
-#ifdef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_DEBUG_INFO
# define ssp_dumpgpio(p,m) lpc17_dumpgpio(p,m)
#else
# define ssp_dumpgpio(p,m)
diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c
index 933fc3c3a5..1232507936 100644
--- a/configs/open1788/src/lpc17_touchscreen.c
+++ b/configs/open1788/src/lpc17_touchscreen.c
@@ -217,14 +217,14 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
#else /* XPT2046_NO_BUSY */
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
static bool last = (bool)-1;
#endif
/* REVISIT: This might need to be inverted */
bool busy = lpc17_gpioread(GPIO_TC_BUSY);
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
if (busy != last)
{
ivdbg("busy:%d\n", busy);
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index 077cdc994a..bbc0569a0a 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -61,12 +61,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
@@ -78,7 +78,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS)
# define led_dumpgpio(m) lpc17_dumpgpio(???, m)
#else
# define led_dumpgpio(m)
diff --git a/configs/pcblogic-pic32mx/README.txt b/configs/pcblogic-pic32mx/README.txt
index 50657c8cb1..d6e5176a5c 100644
--- a/configs/pcblogic-pic32mx/README.txt
+++ b/configs/pcblogic-pic32mx/README.txt
@@ -627,7 +627,7 @@ Configuration sub-directories
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable LCD debug
+ 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/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index d63543eabe..9a3bfd8ce3 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -107,12 +107,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
@@ -174,7 +174,7 @@ struct lcd1602_2
****************************************************************************/
/* Debug */
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstate(FAR const char *msg);
static void lcd_dumpstream(FAR const char *msg,
FAR const struct lcd_instream_s *stream);
@@ -234,7 +234,7 @@ static struct lcd1602_2 g_lcd1602;
* Name: lcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstate(FAR const char *msg)
{
uint8_t buffer[LCD_NCOLUMNS];
@@ -269,7 +269,7 @@ static void lcd_dumpstate(FAR const char *msg)
* Name: lcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstream(FAR const char *msg,
FAR const struct lcd_instream_s *stream)
{
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index 1801625f51..39af605278 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -91,7 +91,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index 0c29d08c53..9beeb57b64 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -99,14 +99,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index 1b46299629..cf74cd0bff 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -102,14 +102,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
index 061fd20d28..642d30aca4 100644
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -74,12 +74,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index ec77d3d1f9..5435b1327e 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -95,14 +95,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index 7defe15977..e785dc5708 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -75,14 +75,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index 1d9e173740..acbb59be36 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_MATH_H=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 40ff45293e..6823fb176e 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_MATH_H=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index 039dd3aa9c..c3491a89ae 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_MATH_H=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index 8723d56a26..ff56c8ecf8 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_MATH_H=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/sabre-6quad/README.txt b/configs/sabre-6quad/README.txt
index 122f28e8d4..8835b84b4f 100644
--- a/configs/sabre-6quad/README.txt
+++ b/configs/sabre-6quad/README.txt
@@ -80,7 +80,7 @@ Status
only 2 CPUS, and disabled the RAMLOG:
+CONFIG_DEBUG=y
- +CONFIG_DEBUG_VERBOSE=y
+ +CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_SCHED=y
+CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 10a3a556d9..692dbdd152 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -83,7 +83,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt
index 2a03890a2c..75fa2f8e3a 100644
--- a/configs/sam3u-ek/README.txt
+++ b/configs/sam3u-ek/README.txt
@@ -625,7 +625,7 @@ Configurations
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ 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/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index c2a13f115b..759209fbaa 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -143,11 +143,11 @@
/* Verbose debug must also be enabled */
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LED
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_REGDEBUG
#endif
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index ee31f18716..54c70f108b 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam3u-ek/src/sam_touchscreen.c b/configs/sam3u-ek/src/sam_touchscreen.c
index f45efa1ea7..eb32f3e766 100644
--- a/configs/sam3u-ek/src/sam_touchscreen.c
+++ b/configs/sam3u-ek/src/sam_touchscreen.c
@@ -182,7 +182,7 @@ static void tsc_clear(FAR struct ads7843e_config_s *state)
static bool tsc_busy(FAR struct ads7843e_config_s *state)
{
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
static bool last = (bool)-1;
#endif
@@ -191,7 +191,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
*/
bool busy = sam_gpioread(GPIO_TCS_BUSY);
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
if (busy != last)
{
ivdbg("busy:%d\n", busy);
diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt
index 90b979059e..63d2afa21a 100644
--- a/configs/sam4e-ek/README.txt
+++ b/configs/sam4e-ek/README.txt
@@ -944,7 +944,7 @@ Touchscreen
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
STATUS: Verified 2014-05-14
@@ -1440,7 +1440,7 @@ Configurations
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ 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/src/sam_ads7843e.c b/configs/sam4e-ek/src/sam_ads7843e.c
index 70f83e94ef..82e2ee0ceb 100644
--- a/configs/sam4e-ek/src/sam_ads7843e.c
+++ b/configs/sam4e-ek/src/sam_ads7843e.c
@@ -179,7 +179,7 @@ static void tsc_clear(FAR struct ads7843e_config_s *state)
static bool tsc_busy(FAR struct ads7843e_config_s *state)
{
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
static bool last = (bool)-1;
#endif
@@ -188,7 +188,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
*/
bool busy = sam_gpioread(GPIO_TCS_BUSY);
-#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
if (busy != last)
{
ivdbg("busy:%d\n", busy);
diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c
index 0e1199307d..1e48b109b8 100644
--- a/configs/sam4e-ek/src/sam_ethernet.c
+++ b/configs/sam4e-ek/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c
index 532e208037..adb614c364 100644
--- a/configs/sam4e-ek/src/sam_ili9325.c
+++ b/configs/sam4e-ek/src/sam_ili9325.c
@@ -202,13 +202,13 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
# undef CONFIG_LCD_REGDEBUG
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index 4864e17c96..2cfdc8df12 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -203,13 +203,13 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
# undef CONFIG_LCD_REGDEBUG
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index 6f32ed2ae1..12eb79fec7 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -99,7 +99,7 @@
#define D4_NOCHANGE (LED_NOCHANGE << D4_SHIFT)
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index aa25659390..7ffe5a3771 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -82,7 +82,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c
index 3b0d61bc36..26c8474c04 100644
--- a/configs/sam4l-xplained/src/sam_slcd.c
+++ b/configs/sam4l-xplained/src/sam_slcd.c
@@ -86,12 +86,12 @@
#endif
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
@@ -294,7 +294,7 @@ struct slcd_pixel_s
****************************************************************************/
/* Debug */
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpstate(FAR const char *msg);
static void slcd_dumpslcd(FAR const char *msg);
#else
@@ -405,7 +405,7 @@ static const struct slcd_pixel_s g_einfo[SLCD_NE] =
* Name: slcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpstate(FAR const char *msg)
{
lcdvdbg("%s:\n", msg);
@@ -424,7 +424,7 @@ static void slcd_dumpstate(FAR const char *msg)
* Name: slcd_dumpslcd
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpslcd(FAR const char *msg)
{
lcdvdbg("%s:\n", msg);
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index 8e053363ce..0b5a832d2b 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index 442e0ad736..455d572b4b 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -75,7 +75,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index afd92aacd8..fd8a930d58 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -109,7 +109,7 @@
#ifdef CONFIG_DEBUG_TIMER
# define tcdbg dbg
# define tclldbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define tcvdbg vdbg
# define tcllvdbg llvdbg
# else
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index ca16d45cba..3176b35d00 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index 4696db19ee..3b987ed3f7 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -92,7 +92,7 @@
#ifdef CONFIG_DEBUG_WATCHDOG
# define wdgdbg dbg
# define wdglldbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define wdgvdbg vdbg
# define wdgllvdbg llvdbg
# else
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index 35eabd5bdb..c5bbda1f79 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -74,7 +74,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index f1e7c5f61b..c2f694d6c4 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index 08f48811f1..2f6cd07bfc 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -90,7 +90,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index 1de7aaf6a4..fe55247be6 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -66,7 +66,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index 553cccc370..e618b20723 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -92,7 +92,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index ed022800f1..3a820b3101 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index ae103f242c..df91027790 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -68,7 +68,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d3x-ek/Kconfig b/configs/sama5d3x-ek/Kconfig
index a4ec696250..553d05bb9b 100644
--- a/configs/sama5d3x-ek/Kconfig
+++ b/configs/sama5d3x-ek/Kconfig
@@ -51,7 +51,7 @@ config SAMA5D3xEK_NOREDLED
config SAMA5D3xEK_NOR_MAIN
bool "Build nor_main"
default n
- depends on SAMA5_BOOT_ISRAM
+ depends on SAMA5_BOOT_ISRAM && BUILD_FLAT
---help---
nor_main is a tiny program that runs in ISRAM. nor_main will enable
NOR flash then either (1) jump to the program in NOR flash or (2)
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 7e612dde9d..1c893146b7 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -92,7 +92,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index 1ac9640c69..324633eaaf 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index 19f6da340e..4a4438da07 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -68,7 +68,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d4-ek/Kconfig b/configs/sama5d4-ek/Kconfig
index d204951b04..caec053c08 100644
--- a/configs/sama5d4-ek/Kconfig
+++ b/configs/sama5d4-ek/Kconfig
@@ -52,7 +52,7 @@ endchoice # SAMA4D4-EK DRAM Type
config SAMA5D4EK_DRAM_MAIN
bool "Build dram_main"
default n
- depends on SAMA5_BOOT_ISRAM
+ depends on SAMA5_BOOT_ISRAM && BUILD_FLAT
---help---
dram_main is a tiny program that runs in ISRAM. dram_main will
enable SDRAM and load an Intel HEX program into SDRAM over the
@@ -78,7 +78,7 @@ config SAMA5D4EK_DRAM_START
config SAMA5D4EK_AT25_MAIN
bool "Build at25_main"
default n
- depends on SAMA5_BOOT_ISRAM
+ depends on SAMA5_BOOT_ISRAM && BUILD_FLAT
---help---
at25_main is a tiny program that runs in ISRAM. at25_main will
enable SDRAM and configure the AT25 Serial FLASH. It will prompt
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 178000a3cc..9f7e836ee1 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -97,7 +97,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index 48edbbe5f8..8b90c71248 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index ac7fae8d00..5cf7b0d9d6 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -72,7 +72,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index 7b88426aee..b9e3b9f7a1 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -82,7 +82,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index 985ae1dbba..04f9352b41 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index 9a559df419..aa6d62a635 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -82,7 +82,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index 7b7e87bf7c..8edefcc077 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/same70-xplained/README.txt b/configs/same70-xplained/README.txt
index 548e496e0a..e35fb67a8b 100644
--- a/configs/same70-xplained/README.txt
+++ b/configs/same70-xplained/README.txt
@@ -746,7 +746,7 @@ MCAN1 Loopback Test
-------------------------
Build Setup -> Debug Options
CONFIG_DEBUG=y # Enables general debug features
- CONFIG_DEBUG_VERBOSE=y # Enables verbose output
+ 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/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index 8fda597e74..5c726c2b12 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -82,7 +82,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index f435028837..de5b5b6c6e 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 73716879c1..5d8fe4eed7 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -82,7 +82,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index ab22a0408e..81e118456a 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt
index bbde3150da..014627e831 100644
--- a/configs/samv71-xult/README.txt
+++ b/configs/samv71-xult/README.txt
@@ -1336,7 +1336,7 @@ MCAN1 Loopback Test
-------------------------
Build Setup -> Debug Options
CONFIG_DEBUG=y # Enables general debug features
- CONFIG_DEBUG_VERBOSE=y # Enables verbose output
+ 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/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index 1009489cf1..58cc34f1ed 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -98,7 +98,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index e6d36ad4cf..e0ff9354f4 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index 61742b3fd6..cf36e89294 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -208,13 +208,13 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
# undef CONFIG_LCD_REGDEBUG
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index ebc161f643..ff2496cc2c 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index c9c33c0a20..f6f95c6d5d 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -207,13 +207,13 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
# undef CONFIG_LCD_REGDEBUG
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index 48949d686a..5e2ba81dbb 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -65,7 +65,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index bddfa1c8b0..5501067f0c 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -72,13 +72,13 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
# undef CONFIG_LCD_REGDEBUG
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index e96fb9afda..0f56906f61 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 900329f2a2..c7dc38f611 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -44,7 +44,7 @@ CONFIG_INTELHEX_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 3da0ca88e8..a22c644dca 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index bd146760dc..62e60cc71c 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -43,7 +43,7 @@ CONFIG_ARCH_FLOAT_H=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index e95d92e04a..a45d341ba6 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index ac90d3010b..a56157ed00 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index 18f38462f0..32196dd8b9 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 14c4f15105..e3f3c92817 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 5db318657f..2b5f953a89 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index b5065b098b..113dc3f622 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 5887fafd2a..98d29376a9 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index 86e5d9cc77..ac0a5d398f 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -43,7 +43,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index e195ae1b94..e2368c9f6c 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -60,7 +60,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index 41641fd7f1..1d97b97416 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index a83f408753..6570d4e8da 100644
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -1065,10 +1065,10 @@ Where is one of the following:
settings in the configuration file:
-CONFIG_DEBUG=n
- -CONFIG_DEBUG_VERBOSE=n
+ -CONFIG_DEBUG_INFO=n
-CONFIG_DEBUG_USB=n
+CONFIG_DEBUG=y
- +CONFIG_DEBUG_VERBOSE=y
+ +CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_USB=y
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index ed7ca1f2d8..f86e722872 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -162,12 +162,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index 66679b48a3..5d228edb1c 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index e2d5a67aa1..b59ade2cd1 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index 43ef81fe3e..bb572f7eda 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -114,12 +114,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index 182e3b1752..fe667383cc 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index 410e944795..49a2692fb0 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index c358ffd1eb..4c4491e047 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -114,12 +114,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index eadca33b22..dfe40d9bdb 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -58,7 +58,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index b39f6b97ee..0b0e464368 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index 0af6059508..4a20fe6a1a 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -61,13 +61,13 @@
/* Enables debug output from this file (needs CONFIG_DEBUG too) */
#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...)
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 71d2bfdb05..73e84298bf 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 791bf94cc1..78f9a96265 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -61,13 +61,13 @@
/* Enables debug output from this file (needs CONFIG_DEBUG too) */
#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...)
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index d55a5835ce..5012ccdd14 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index 8c5d8065a9..68e9105f67 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index f4eb8234c7..7adb9cc1d5 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -44,7 +44,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index ce9d5bcb40..ccc969c027 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 682ccfd5f9..39a13c477e 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index 2702367671..0c7ace6f01 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -44,7 +44,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index f4dd057b66..69d78d70bb 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index 1d0d97d48f..b3bf643434 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c
index 588b9ee82b..a9ceb9f90a 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1289.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1289.c
@@ -77,12 +77,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index 1401ca2bb4..93a7d8c35b 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -60,7 +60,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 47a1d45bba..4f3a3573bc 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -54,7 +54,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index f4d90b146b..0bccc352d6 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -52,7 +52,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index 9d68963f5d..b903233d87 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index 22ee677176..21f8aaac78 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index c37d3a7a7c..612bd76c65 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -63,12 +63,12 @@
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_SPI
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index 5e5c56d5f2..f7d0822b4f 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32ldiscovery/README.txt b/configs/stm32ldiscovery/README.txt
index 532fbe198c..5b957dcf47 100644
--- a/configs/stm32ldiscovery/README.txt
+++ b/configs/stm32ldiscovery/README.txt
@@ -814,7 +814,7 @@ Configuration sub-directories
Build Setup -> Debug Options:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable LCD debug
+ 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/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index 073391b938..10b717725c 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -74,7 +74,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c
index 3c249a76d9..cc6ff19d43 100644
--- a/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -85,12 +85,12 @@
#endif
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
@@ -298,7 +298,7 @@ struct stm32_slcdstate_s
****************************************************************************/
/* Debug */
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpstate(FAR const char *msg);
static void slcd_dumpslcd(FAR const char *msg);
#else
@@ -440,7 +440,7 @@ static uint32_t g_slcdgpio[BOARD_SLCD_NGPIOS] =
* Name: slcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpstate(FAR const char *msg)
{
lcdvdbg("%s:\n", msg);
@@ -461,7 +461,7 @@ static void slcd_dumpstate(FAR const char *msg)
* Name: slcd_dumpslcd
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void slcd_dumpslcd(FAR const char *msg)
{
lcdvdbg("%s:\n", msg);
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 4686eb97c7..759b78a803 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -56,7 +56,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index 62cc0a20db..65158af6d1 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -59,7 +59,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index 8ce44ce3c7..ea79c4b20e 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -741,7 +741,7 @@ Where is one of the following:
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_FS=y : Enable file system debug
CONFIG_DEBUG_SPI=y : Enable SPI debug
@@ -773,7 +773,7 @@ Where is one of the following:
Build Setup -> Debug Options:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ CONFIG_DEBUG_INFO=y : Enable verbose debug output
CONFIG_DEBUG_LCD=y : Enable LCD debug output
NOTES:
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index 46cf61993e..9f1619e5c8 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -90,14 +90,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
index 8911d8dd84..afd1f1696c 100644
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -114,12 +114,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
@@ -179,7 +179,7 @@ struct lcd1602_2
****************************************************************************/
/* Debug */
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstate(FAR const char *msg);
static void lcd_dumpstream(FAR const char *msg,
FAR const struct lcd_instream_s *stream);
@@ -243,7 +243,7 @@ static struct lcd1602_2 g_lcd1602;
* Name: lcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstate(FAR const char *msg)
{
uint8_t buffer[LCD_NCOLUMNS];
@@ -278,7 +278,7 @@ static void lcd_dumpstate(FAR const char *msg)
* Name: lcd_dumpstate
****************************************************************************/
-#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
static void lcd_dumpstream(FAR const char *msg,
FAR const struct lcd_instream_s *stream)
{
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index dc7cd4334b..a959d083f4 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -121,17 +121,17 @@
/* The following enable debug output from this file.
*
* CONFIG_DEBUG_SPI && CONFIG_DEBUG - Define to enable basic SPI debug
- * CONFIG_DEBUG_VERBOSE - Define to enable verbose SPI debug
+ * CONFIG_DEBUG_INFO - Define to enable verbose SPI debug
*/
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_SPI
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index 9cd4821f42..ad564a2cda 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -58,12 +58,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index f19be23718..500557d15d 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_INTELHEX_BINARY=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_VERBOSE=y
+CONFIG_DEBUG_INFO=y
#
# Subsystem Debug Options
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index fbc967208d..4c417a76e6 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -57,12 +57,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 4227fea056..0b2a1d3cc5 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -59,7 +59,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 01c6c9a71a..4189f7297a 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -98,7 +98,7 @@
*/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index e1127a01f5..f49c9f9eb5 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -69,7 +69,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define ssivdbg lldbg
# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
#else
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index d73ab5a13f..743fcce239 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -68,7 +68,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index 76238c548a..b8274c1eb3 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -120,7 +120,7 @@
#define LED_PANIC_OFF_CLRBITS ((K60_LED4) << OFF_CLRBITS_SHIFT)
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 923f1c5046..73f0d2fcf3 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index 5987d6f66e..bd92242ddc 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -57,12 +57,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index a4884c2d33..fdcf200f9f 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -99,14 +99,14 @@
#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
# endif
#else
# undef CONFIG_DEBUG_LEDS
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# define leddbg(x...)
# define ledvdbg(x...)
#endif
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index 509a476170..a07182756d 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -767,7 +767,7 @@ Configurations
Build Setup:
CONFIG_DEBUG=y : Enable debug features
- CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
+ 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/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index f6ba968118..7a565bf5b7 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -54,7 +54,7 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * with CONFIG_DEBUG_VERBOSE too)
+ * with CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index c938e80852..8c83d34ea9 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -69,12 +69,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index fe61c46aa1..4625d2eb57 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_WINDOWS_CYGWIN=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 6ee164a4ea..cb6238c254 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -44,7 +44,7 @@ CONFIG_WINDOWS_CYGWIN=y
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_STACKCHECK is not set
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 3d4744e090..e64e86fce0 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -42,7 +42,7 @@ CONFIG_WINDOWS_CYGWIN=y
# Debug Options
#
CONFIG_DEBUG=y
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index aa8fc95358..ef7487caa4 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index df99499d71..fb57aee022 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -48,7 +48,7 @@ CONFIG_BUILD_FLAT=y
#
CONFIG_DEBUG=y
# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_VERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
#
# Subsystem Debug Options
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index 01bf1d58a8..80da662a76 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -69,7 +69,7 @@
****************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG with
- * CONFIG_DEBUG_VERBOSE too)
+ * CONFIG_DEBUG_INFO too)
*/
#undef LCD_DEBUG /* Define to enable debug */
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index 5f8454463d..a96f0678fb 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -63,12 +63,12 @@
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
- * and pherhaps CONFIG_DEBUG_VERBOSE too)
+ * and pherhaps CONFIG_DEBUG_INFO too)
*/
#ifdef CONFIG_DEBUG_LEDS
# define leddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define ledvdbg lldbg
# else
# define ledvdbg(x...)
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index 3adb005d89..98a2cc7839 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -67,7 +67,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
@@ -79,7 +79,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define spi_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
#else
# define spi_dumpgpio(m)
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index d72192c367..fdf95550a5 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -67,7 +67,7 @@
#ifdef CONFIG_DEBUG_SPI
# define sspdbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define sspvdbg lldbg
# else
# define sspvdbg(x...)
@@ -79,7 +79,7 @@
/* Dump GPIO registers */
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
#else
# define ssp_dumpgpio(m)
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index 43fb0e095b..1b621d9263 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -91,7 +91,7 @@
#ifdef CONFIG_DEBUG_SPI
# define spidbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg lldbg
# else
# define spivdbg(x...)
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index ccd9c0d18d..768a3a93a2 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg);
-#endif /* CONFIG_DEBUG && CONFIG_DEBUG_VERBOSE */
+#endif /* CONFIG_DEBUG && 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE */
+#endif /* CONFIG_DEBUG && 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_VERBOSE)
+#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
ads1242_print_regs(priv, "ads1242_open");
#endif
diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c
index d542bb7797..355cd9b041 100644
--- a/drivers/analog/pga11x.c
+++ b/drivers/analog/pga11x.c
@@ -105,13 +105,13 @@
/* Check if (non-standard) 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 dbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define spivdbg dbg
# else
# define spivdbg(x...)
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index 5f2d6a5c02..a047171428 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -81,14 +81,14 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_I2S
#endif
#ifdef CONFIG_DEBUG_I2S
# define i2sdbg dbg
# define i2slldbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define i2svdbg dbg
# define i2sllvdbg lldbg
# else
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 17cbe285f3..349ccfa9a2 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -176,10 +176,10 @@ config MXT_NPOLLWAITERS
---help---
Maximum number of threads that can be waiting on poll()
-config MXT_DISABLE_DEBUG_VERBOSE
+config MXT_DISABLE_CONFIG_DEBUG_INFO
bool "Disable verbose debug output"
default y
- depends on DEBUG_VERBOSE && DEBUG_INPUT
+ depends on CONFIG_DEBUG_INFO && DEBUG_INPUT
---help---
The maXTouch tends to generate interrupts at a high rate during the
contact. If verbose debug is enabled in this driver, you may not
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 1b370e9579..cd761ec271 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -41,8 +41,8 @@
/* Suppress verbose debug output so that we don't swamp the system */
-#ifdef CONFIG_MXT_DISABLE_DEBUG_VERBOSE
-# undef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_MXT_DISABLE_CONFIG_DEBUG_INFO
+# undef CONFIG_DEBUG_INFO
#endif
#include
diff --git a/drivers/input/mxt.h b/drivers/input/mxt.h
index da7bf42966..459684da72 100644
--- a/drivers/input/mxt.h
+++ b/drivers/input/mxt.h
@@ -50,11 +50,11 @@
#undef MXT_SUPPORT_T6
#if !defined(CONFIG_DEBUG)
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_INPUT
#endif
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_INPUT)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_INPUT)
# define MXT_SUPPORT_T6 1
#endif
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index 2d078e1ff0..c725a9dab1 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -107,12 +107,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index d98935f84f..0770cc852e 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -101,12 +101,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 5a7e6ab976..51cb39fe10 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -239,11 +239,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_REGDEBUG
#endif
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index 8d51c77a97..7cb7ad299d 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -148,11 +148,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_RITDEBUG
#endif
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index aa8758ab64..ed1897ef62 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -104,12 +104,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 454fdcc41a..0c38ac441e 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -67,11 +67,11 @@
/* Verbose debug must also be enabled */
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_SKELDEBUG
#endif
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index f5cef7996c..6ef171b306 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -105,12 +105,12 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 323fda4c73..62736e38c3 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -106,11 +106,11 @@
/* Verbose debst7565 must also be enabled to use the extra OLED debst7565 */
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_ST7565DEBUG
#endif
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index 77ba1bbc1d..4447b1ef4e 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -124,11 +124,11 @@
/* Verbose debst7567 must also be enabled to use the extra OLED debst7567 */
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_GRAPHICS
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_LCD_ST7567DEBUG
#endif
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index e9053a7218..89e7ba5a62 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -126,10 +126,10 @@
/* Verbose debug must also be enabled to use the extra OLED debug */
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 68fd8d5f7a..e0843100e7 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -62,13 +62,13 @@
****************************************************************************/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LEDS
#endif
#ifdef CONFIG_DEBUG_LEDS
# define ddbg lldbg
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define dvdbg lldbg
# else
# define dvdbg(x...)
diff --git a/drivers/mmcsd/mmcsd.h b/drivers/mmcsd/mmcsd.h
index 06d91348d0..b9dba016bf 100644
--- a/drivers/mmcsd/mmcsd.h
+++ b/drivers/mmcsd/mmcsd.h
@@ -52,7 +52,7 @@
#undef CONFIG_MMCSD_DUMPALL /* MUST BE DEFINED MANUALLY */
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
# undef CONFIG_MMCSD_DUMPALL
#endif
@@ -92,7 +92,7 @@ extern "C" {
# define mmcsd_dumpbuffer(m,b,l)
#endif
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
EXTERN void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype);
#else
# define mmcsd_dmpcsd(csd,cadtype)
diff --git a/drivers/mmcsd/mmcsd_debug.c b/drivers/mmcsd/mmcsd_debug.c
index e28b985a02..fdea1dfdaf 100644
--- a/drivers/mmcsd/mmcsd_debug.c
+++ b/drivers/mmcsd/mmcsd_debug.c
@@ -81,7 +81,7 @@
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype)
{
bool mmc = (cardtype == MMCSD_CARDTYPE_MMC);
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index e3097d4812..53d59985df 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && 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_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
decoded.mfgdata = scr[1]; /* Might be byte reversed! */
fvdbg("SCR:\n");
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index da4327b50b..7797cd22ba 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -250,7 +250,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block)
*
****************************************************************************/
-#if defined(CONFIG_MTD_NAND_BLOCKCHECK) && defined(CONFIG_DEBUG_VERBOSE) && \
+#if defined(CONFIG_MTD_NAND_BLOCKCHECK) && defined(CONFIG_DEBUG_INFO) && \
defined(CONFIG_DEBUG_FS)
static int nand_devscan(FAR struct nand_dev_s *nand)
{
@@ -258,7 +258,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
FAR struct nand_model_s *model;
off_t nblocks;
off_t block;
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
off_t good;
unsigned int ngood;
#endif
@@ -279,7 +279,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
/* Retrieve block status from their first page spare area */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
ngood = 0;
#endif
@@ -290,7 +290,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
ret = nand_checkblock(nand, block);
if (ret != GOODBLOCK)
{
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
if (ngood > 0)
{
fvdbg("Good blocks: %u - %u\n", good, good + ngood);
@@ -307,7 +307,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
(unsigned int)block, ret);
}
}
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
else
{
if (ngood == 0)
@@ -320,7 +320,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
#endif
}
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
if (ngood > 0)
{
fvdbg("Good blocks: %u - %u\n", good, good + ngood);
@@ -329,7 +329,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
return OK;
}
-#endif /* CONFIG_MTD_NAND_BLOCKCHECK && CONFIG_DEBUG_VERBOSE && CONFIG_DEBUG_FS */
+#endif /* CONFIG_MTD_NAND_BLOCKCHECK && CONFIG_DEBUG_INFO && CONFIG_DEBUG_FS */
/****************************************************************************
* Name: nand_chipid
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 49ad8d710f..5e1ef3fee1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -498,9 +498,9 @@ config NETDEV_PHY_DEBUG
depends on DEBUG
---help---
Normally debug output is controlled by DEBUG_NET. However, that
- may generate a LOT of debug output, especially if DEBUG_VERBOSE is
+ may generate a LOT of debug output, especially if CONFIG_DEBUG_INFO is
also selected. This option is intended to force VERVOSE debug
- output from certain PHY-related even if DEBUG_NET or DEBUG_VERBOSE
+ output from certain PHY-related even if DEBUG_NET or CONFIG_DEBUG_INFO
are not selected. This allows for focused, unit-level debug of
the NSH network initialization logic.
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index be34ecb8de..e59f58c364 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -42,8 +42,8 @@
/* Force verbose debug on in this file only to support unit-level testing. */
#ifdef CONFIG_NETDEV_PHY_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
-# define CONFIG_DEBUG_VERBOSE 1
+# undef CONFIG_DEBUG_INFO
+# define CONFIG_DEBUG_INFO 1
# undef CONFIG_DEBUG_NET
# define CONFIG_DEBUG_NET 1
#endif
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 505a01cb94..bdf6fcf82e 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_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.
*/
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 823b330982..4f8bf7c083 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -84,13 +84,13 @@
*/
#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...)
diff --git a/drivers/usbdev/usbmsc_scsi.c b/drivers/usbdev/usbmsc_scsi.c
index a8b0f4004f..72bc3a8f97 100644
--- a/drivers/usbdev/usbmsc_scsi.c
+++ b/drivers/usbdev/usbmsc_scsi.c
@@ -115,7 +115,7 @@
/* Debug ********************************************************************/
-#if defined(CONFIG_DEBUG_VERBOSE) && defined (CONFIG_DEBUG_USB)
+#if defined(CONFIG_DEBUG_INFO) && defined (CONFIG_DEBUG_USB)
static void usbmsc_dumpdata(const char *msg, const uint8_t *buf,
int buflen);
#else
@@ -195,7 +195,7 @@ static int usbmsc_cmdstatusstate(FAR struct usbmsc_dev_s *priv);
* Name: usbmsc_dumpdata
****************************************************************************/
-#if defined(CONFIG_DEBUG_VERBOSE) && defined (CONFIG_DEBUG_USB)
+#if defined(CONFIG_DEBUG_INFO) && defined (CONFIG_DEBUG_USB)
static void usbmsc_dumpdata(const char *msg, const uint8_t *buf, int buflen)
{
int i;
diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c
index 0c35d61bf4..2799356b69 100644
--- a/drivers/usbhost/usbhost_cdcacm.c
+++ b/drivers/usbhost/usbhost_cdcacm.c
@@ -833,7 +833,7 @@ static void usbhost_notification_callback(FAR void *arg, ssize_t nbytes)
* FIX: Don't output the message is the result is -EAGAIN.
*/
-#if defined(CONFIG_DEBUG_USB) && !defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && !defined(CONFIG_DEBUG_INFO)
if (nbytes != -EAGAIN)
#endif
{
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index b36434dd31..e11d02709b 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -1010,7 +1010,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
#ifndef CONFIG_HIDKBD_NODEBOUNCE
uint8_t lastkey[6] = {0, 0, 0, 0, 0, 0};
#endif
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
unsigned int npolls = 0;
#endif
unsigned int nerrors = 0;
@@ -1223,7 +1223,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
* polling is still happening.
*/
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
npolls++;
if ((npolls & 31) == 0)
{
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index c61541d9c2..e7d86e6317 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -1049,7 +1049,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
#ifndef CONFIG_HIDMOUSE_TSCIF
uint8_t buttons;
#endif
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
unsigned int npolls = 0;
#endif
unsigned int nerrors = 0;
@@ -1208,7 +1208,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
* polling is still happening.
*/
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
npolls++;
if ((npolls & 31) == 0)
{
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index 34b37f9b29..7576eb565f 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -1186,7 +1186,7 @@ static void usbhost_callback(FAR void *arg, ssize_t nbytes)
* FIX: Don't output the message is the result is -EAGAIN.
*/
-#if defined(CONFIG_DEBUG_USB) && !defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && !defined(CONFIG_DEBUG_INFO)
if (nbytes != -EAGAIN)
#endif
{
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index 5d01a22b06..a4d5da6002 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -168,7 +168,7 @@ static inline void usbhost_mkdevname(FAR struct usbhost_state_s *priv,
/* CBW/CSW debug helpers */
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw);
static void usbhost_dumpcsw(FAR struct usbmsc_csw_s *csw);
#else
@@ -501,7 +501,7 @@ static inline void usbhost_mkdevname(FAR struct usbhost_state_s *priv, char *dev
*
****************************************************************************/
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw)
{
int i;
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index fb3b71a425..7fc1b46f52 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -46,9 +46,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 1d7e28d814..d70f7c02e0 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -46,9 +46,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index 947cbfe905..1f6149b398 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -45,9 +45,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 4f25d4931e..6356d6df35 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -44,9 +44,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index a216a49524..6c0c880a04 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -45,9 +45,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index cad2f5ca3f..bbbfe3251c 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -49,9 +49,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index e1db02f040..0d03aa275c 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -49,9 +49,9 @@
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# 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
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include
diff --git a/include/debug.h b/include/debug.h
index 066ba5a2d6..de212f968d 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -71,7 +71,7 @@
* handlers.
*
* [a-z]vdbg() -- Identical to [a-z]dbg() except that it also requires that
- * CONFIG_DEBUG_VERBOSE be defined. This is intended for general debug
+ * CONFIG_DEBUG_INFO be defined. This is intended for general debug
* output that you would normally want to suppress.
*
* [a-z]lldbg() -- Identical to [a-z]dbg() except this is uses special
@@ -86,7 +86,7 @@
* example, only [a-z]lldbg() should be used in interrupt handlers.
*
* [a-z]llvdbg() -- Identical to [a-z]lldbg() except that it also requires that
- * CONFIG_DEBUG_VERBOSE be defined. This is intended for general debug
+ * CONFIG_DEBUG_INFO be defined. This is intended for general debug
* output that you would normally want to suppress.
*/
@@ -126,7 +126,7 @@
# define lldbg(x...)
# endif
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define vdbg(format, ...) \
__arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
@@ -137,10 +137,10 @@
# define llvdbg(x...)
# endif
-# else /* CONFIG_DEBUG_VERBOSE */
+# else /* CONFIG_DEBUG_INFO */
# define vdbg(x...)
# define llvdbg(x...)
-# endif /* CONFIG_DEBUG_VERBOSE */
+# endif /* CONFIG_DEBUG_INFO */
#else /* CONFIG_DEBUG */
@@ -341,7 +341,7 @@
# ifndef CONFIG_ARCH_LOWPUTC
# define lldbg (void)
# endif
-# ifndef CONFIG_DEBUG_VERBOSE
+# ifndef CONFIG_DEBUG_INFO
# define vdbg (void)
# define llvdbg (void)
# else
@@ -544,7 +544,7 @@
#ifdef CONFIG_DEBUG
# define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
# define vdbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
# else
# define vdbgdumpbuffer(m,b,n)
@@ -691,7 +691,7 @@ int dbg(const char *format, ...);
int lldbg(const char *format, ...);
# endif
-# ifdef CONFIG_DEBUG_VERBOSE
+# ifdef CONFIG_DEBUG_INFO
int vdbg(const char *format, ...);
# ifdef CONFIG_ARCH_LOWPUTC
diff --git a/include/nuttx/analog/pga11x.h b/include/nuttx/analog/pga11x.h
index 7b6cf7881c..d95589cdae 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_VERBOSE,
+ * CONFIG_DEBUG_SPI -- With CONFIG_DEBUG 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 323c4dd696..709b701553 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -68,7 +68,7 @@
/* Configuration ************************************************************/
/* CONFIG_AUDIO - Enables Audio driver support
* CONFIG_DEBUG_AUDIO - If enabled (with CONFIG_DEBUG and, optionally,
- * CONFIG_DEBUG_VERBOSE), this will generate output that can be used to
+ * CONFIG_DEBUG_INFO), this will generate output that can be used to
* debug Audio drivers.
*/
diff --git a/include/nuttx/pwm.h b/include/nuttx/pwm.h
index f77cbee23a..24d2e6980d 100644
--- a/include/nuttx/pwm.h
+++ b/include/nuttx/pwm.h
@@ -73,7 +73,7 @@
* 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_VERBOSE), this will generate output that can be use dto
+ * CONFIG_DEBUG_INFO), this will generate output that can be use dto
* debug the PWM driver.
*/
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index d0281a2492..e39fa68639 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -70,13 +70,13 @@
*/
#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...)
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index fee6a9f1fc..8e91b5345f 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -57,13 +57,13 @@
*/
#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...)
diff --git a/include/nuttx/usb/usbhost_trace.h b/include/nuttx/usb/usbhost_trace.h
index f8e8d1b495..5351cb090e 100644
--- a/include/nuttx/usb/usbhost_trace.h
+++ b/include/nuttx/usb/usbhost_trace.h
@@ -50,7 +50,7 @@
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_USB
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
#endif
#ifndef CONFIG_USBHOST_TRACE
@@ -61,7 +61,7 @@
#if defined(CONFIG_USBHOST_TRACE) || defined(CONFIG_DEBUG_USB)
# define HAVE_USBHOST_TRACE 1
-# if defined(CONFIG_USBHOST_TRACE_VERBOSE) || defined(CONFIG_DEBUG_VERBOSE)
+# if defined(CONFIG_USBHOST_TRACE_VERBOSE) || defined(CONFIG_DEBUG_INFO)
# define HAVE_USBHOST_TRACE_VERBOSE 1
# endif
#endif
@@ -116,7 +116,7 @@ extern "C"
****************************************************************************/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_USB
#endif
diff --git a/libc/libc.csv b/libc/libc.csv
index d93fe22a27..cd74cc09a7 100644
--- a/libc/libc.csv
+++ b/libc/libc.csv
@@ -65,7 +65,7 @@
"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 *","..."
-"llvdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llvdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && 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,7 +168,7 @@
"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 *"
-"vdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_VERBOSE)","int","const char *","..."
+"vdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && 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"
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index 14044175b7..821353944f 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -90,7 +90,7 @@ int lldbg(const char *format, ...)
}
#endif
-#ifdef CONFIG_DEBUG_VERBOSE
+#ifdef CONFIG_DEBUG_INFO
int vdbg(const char *format, ...)
{
va_list ap;
@@ -116,6 +116,6 @@ int llvdbg(const char *format, ...)
return ret;
}
#endif /* CONFIG_ARCH_LOWPUTC */
-#endif /* CONFIG_DEBUG_VERBOSE */
+#endif /* CONFIG_DEBUG_INFO */
#endif /* CONFIG_DEBUG */
#endif /* CONFIG_CPP_HAVE_VARARGS */
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index 00055de360..bba8c7a8dc 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -58,11 +58,11 @@
*/
#ifndef CONFIG_DEBUG
-# undef CONFIG_DEBUG_VERBOSE
+# undef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
-#ifndef CONFIG_DEBUG_VERBOSE
+#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_DEBUG_LCD
#endif
diff --git a/sched/Kconfig b/sched/Kconfig
index 27ba4e43c0..d85be10ce7 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -1013,7 +1013,7 @@ config MODULE_BUFFERINCR
config MODULE_DUMPBUFFER
bool "Dump module buffers"
default n
- depends on DEBUG && DEBUG_VERBOSE
+ depends on DEBUG && CONFIG_DEBUG_INFO
---help---
Dump various module buffers for debug purposes
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index c16069caf5..6bcf0e152a 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -56,11 +56,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_MODULE_DUMPBUFFER have to
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_MODULE_DUMPBUFFER have to
* be defined or CONFIG_MODULE_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_MODULE_DUMPBUFFER)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_MODULE_DUMPBUFFER)
# undef CONFIG_MODULE_DUMPBUFFER
#endif
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index 9242c5419e..7ab65e734d 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -58,11 +58,11 @@
* Pre-processor Definitions
****************************************************************************/
-/* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
* defined or CONFIG_MODULE_DUMPBUFFER does nothing.
*/
-#if !defined(CONFIG_DEBUG_VERBOSE) || !defined (CONFIG_DEBUG_BINFMT)
+#if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
# undef CONFIG_MODULE_DUMPBUFFER
#endif
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 710a0926e2..4be92476d8 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -271,7 +271,7 @@ int main(int argc, char **argv, char **envp)
printf("/* Verbose debug and sub-system debug only make sense if debug is enabled */\n\n");
printf("#ifndef CONFIG_DEBUG\n");
- printf("# undef CONFIG_DEBUG_VERBOSE\n");
+ printf("# undef CONFIG_DEBUG_INFO\n");
printf("# undef CONFIG_DEBUG_ANALOG\n");
printf("# undef CONFIG_DEBUG_AUDIO\n");
printf("# undef CONFIG_DEBUG_BINFMT\n");